pierre/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add "rerere" to git config for better merge conflicts resolution

Browse Source
This commit is contained in:
Pierre Martin
2015-09-23 16:17:27 +02:00
parent 13b194e0c9
commit 61e81fa695
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/gitconfig.j2
View File

@@ -14,4 +14,6 @@
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
editor = vim editor = vim
filemode = false filemode = false
[rerere]
enabled = true