diff options
| author | Florian Pritz <bluewind@xinu.at> | 2016-01-28 16:31:47 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2016-01-28 16:31:47 +0100 |
| commit | 5cb957748ec70ea3886799633a0ef28461d66be0 (patch) | |
| tree | 872667c24db8415c64a85452d052da7849a675ea /.gitconfig | |
| parent | ce7226a3428bd211ba15bf7c2291f55c17ac22ac (diff) | |
| download | dotfiles-5cb957748ec70ea3886799633a0ef28461d66be0.tar.gz dotfiles-5cb957748ec70ea3886799633a0ef28461d66be0.tar.xz | |
misc
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -22,6 +22,7 @@ ours = "!f() { git checkout --ours $@ && git add $@; }; f" theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" p = push --follow-tags + dw = diff --color-words [merge] tool = vimdiff conflictstyle = diff3 |