Fix formatting
This commit is contained in:
parent
920c2e9d91
commit
712a3c82e3
|
@ -42,7 +42,7 @@
|
|||
autosetuprebase = always
|
||||
|
||||
[checkout]
|
||||
defaultRemote = origin
|
||||
defaultRemote = origin
|
||||
|
||||
[color]
|
||||
branch = auto
|
||||
|
@ -78,14 +78,12 @@
|
|||
tool = vimdiff
|
||||
|
||||
[fetch]
|
||||
# Always prune when fetching (and pulling).
|
||||
prune = true
|
||||
|
||||
[gitsh]
|
||||
nogreeting = true
|
||||
|
||||
[grep]
|
||||
# Show the line numbers in the output.
|
||||
lineNumber = true
|
||||
|
||||
[help]
|
||||
|
@ -99,7 +97,6 @@
|
|||
autostash = true
|
||||
|
||||
[rerere]
|
||||
# Store and re-use manual conflict resolution changes.
|
||||
enabled = true
|
||||
|
||||
[push]
|
||||
|
|
Loading…
Reference in a new issue