dot/git
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make conflicts easier to handle by preserving merges on rebase and enabling rerere

Browse source
This commit is contained in:
Danielle McLean 2016-11-18 09:47:20 +11:00
parent 082b24ea47
commit c0f087d8e2
No known key found for this signature in database
GPG key ID: CC91589719027E94
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
config/git/config
View file

@ -14,3 +14,8 @@
[url "git@github.com:"] [url "git@github.com:"]
pushInsteadOf = https://github.com/ pushInsteadOf = https://github.com/
[git-up.rebase]
arguments = --preserve-merges
[rerere]
enabled = true