git: autostash
This commit is contained in:
parent
1761df5220
commit
9dde7db97e
1 changed files with 4 additions and 0 deletions
|
@ -17,8 +17,12 @@ showUntrackedFiles = all
|
||||||
default = simple
|
default = simple
|
||||||
[pull]
|
[pull]
|
||||||
rebase = true
|
rebase = true
|
||||||
|
autostash = true
|
||||||
[merge]
|
[merge]
|
||||||
conflictStyle = diff3
|
conflictStyle = diff3
|
||||||
|
autostash = true
|
||||||
|
[rebase]
|
||||||
|
autostash = true
|
||||||
[diff]
|
[diff]
|
||||||
renames = true
|
renames = true
|
||||||
[fetch]
|
[fetch]
|
||||||
|
|
Loading…
Reference in a new issue