git: Set auto squash for rebase by default and addEmptyPathspec to false
This commit is contained in:
parent
a0739c3ef9
commit
6828369a17
1 changed files with 3 additions and 0 deletions
|
@ -28,6 +28,7 @@
|
||||||
cmd = 'nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'
|
cmd = 'nvim -c DiffConflicts "$MERGED" "$BASE" "$LOCAL" "$REMOTE"'
|
||||||
trustExitCode = true
|
trustExitCode = true
|
||||||
[rebase]
|
[rebase]
|
||||||
|
autosquash = true
|
||||||
autoStash = true
|
autoStash = true
|
||||||
[commit]
|
[commit]
|
||||||
verbose = true
|
verbose = true
|
||||||
|
@ -41,3 +42,5 @@
|
||||||
navigate = true
|
navigate = true
|
||||||
features = line-numbers decorations
|
features = line-numbers decorations
|
||||||
whitespace-error-style = 22 reverse
|
whitespace-error-style = 22 reverse
|
||||||
|
[advice]
|
||||||
|
addEmptyPathspec = false
|
||||||
|
|
Loading…
Reference in a new issue