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