diff options
| author | Florian Pritz <bluewind@xinu.at> | 2014-08-13 00:37:04 +0200 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2014-08-13 00:37:04 +0200 |
| commit | a33968be140dba9c01125763328a716aab1ea9f3 (patch) | |
| tree | b9b3908e087a2858dc4fc37faf0e3cc54a4621bf /.gitconfig | |
| parent | 5c185c41871a1d1b7e5851adb7c5a72acb5abd08 (diff) | |
| download | dotfiles-a33968be140dba9c01125763328a716aab1ea9f3.tar.gz dotfiles-a33968be140dba9c01125763328a716aab1ea9f3.tar.xz | |
misc
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitconfig')
| -rw-r--r-- | .gitconfig | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -19,6 +19,8 @@ mff = merge --ff-only refl = reflog --date=relative mnf = merge --no-ff + ours = "!f() { git checkout --ours $@ && git add $@; }; f" + theirs = "!f() { git checkout --theirs $@ && git add $@; }; f" [merge] tool = vimdiff conflictstyle = diff3 |