diff options
| author | Florian Pritz <bluewind@xinu.at> | 2015-10-26 17:08:03 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-10-26 17:08:03 +0100 |
| commit | 62faba9b5db29d4bc170fb7d278350786d55b76d (patch) | |
| tree | fe56d9737d068ea2322a91e26a63b55d8c42f705 /.gitconfig | |
| parent | fe829316fe26791a07890a820ec7910d8991d701 (diff) | |
| download | dotfiles-62faba9b5db29d4bc170fb7d278350786d55b76d.tar.gz dotfiles-62faba9b5db29d4bc170fb7d278350786d55b76d.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
@@ -21,6 +21,7 @@ mnf = merge --no-ff ours = "!f() { git checkout --ours $@ && git add $@; }; f" theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" + p = push --follow-tags [merge] tool = vimdiff conflictstyle = diff3 |