git: enable rerere
This commit is contained in:
parent
ba57fb58f4
commit
d45211ea47
|
@ -21,6 +21,9 @@
|
||||||
[merge]
|
[merge]
|
||||||
conflictStyle = diff3
|
conflictStyle = diff3
|
||||||
|
|
||||||
|
[rerere]
|
||||||
|
enabled = true
|
||||||
|
|
||||||
[rebase]
|
[rebase]
|
||||||
abbreviateCommands = true
|
abbreviateCommands = true
|
||||||
autoSquash = true
|
autoSquash = true
|
||||||
|
|
Reference in New Issue