diff options
| author | Florian Pritz <bluewind@xinu.at> | 2015-09-10 12:09:56 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-09-10 12:12:50 +0200 |
| commit | 9be5150c9f689b954cd269c1aa5fe0957198c96c (patch) | |
| tree | f8183d017a0d1c6820b06888e10f0f629b1b2a43 /.gitconfig | |
| parent | 9c4c1b7e5d15b748530f1950e36317661afa1684 (diff) | |
| download | dotfiles-9be5150c9f689b954cd269c1aa5fe0957198c96c.tar.gz dotfiles-9be5150c9f689b954cd269c1aa5fe0957198c96c.tar.xz | |
misc
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -40,9 +40,14 @@ cmd = vim -f \"$MERGED\" [mergetool "vimdiff3"] cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" +[mergetool "splice"] + cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'" + trustExitCode = true [core] excludesfile = ~/.gitignore compression = 9 attributesfile = ~/git/dotfiles/.gitattributes [log] decorate = full +[gc] + autopacklimit = 20 |