aynish/helm
1
0
Fork 0
Code Pull requests Packages Projects Releases Activity

gitconfig: autosquash = true

Browse source
This commit is contained in:
Henrik Lissner 2016-05-26 18:55:46 -04:00
parent c0420298eb
commit 6be5c63c54
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
gitconfig
View file

@ -22,6 +22,8 @@
tool = ediff tool = ediff
[mergetool "ediff"] [mergetool "ediff"]
cmd = emacsclient -c -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\" cmd = emacsclient -c -a \"\" --eval \"(ediff-merge-files-with-ancestor \\\"$LOCAL\\\" \\\"$REMOTE\\\" \\\"$BASE\\\" nil \\\"$MERGED\\\")\"
[rebase]
autosquash = true
[push] [push]
default = simple default = simple
[credential] [credential]