summaryrefslogtreecommitdiffstats
path: root/.gitconfig
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-08-08 14:47:30 +0200
committerFlorian Pritz <bluewind@xinu.at>2013-08-08 14:47:30 +0200
commit1bf05d62092a1cc3f9fe9e7d6423aff01dc32f7b (patch)
tree7fb8e8a2bc9f6da0948b0e24c0de8ec67258ed53 /.gitconfig
parent60eca56dda324445bc95005915e5c70dfa498010 (diff)
downloaddotfiles-1bf05d62092a1cc3f9fe9e7d6423aff01dc32f7b.tar.gz
dotfiles-1bf05d62092a1cc3f9fe9e7d6423aff01dc32f7b.tar.xz
gitconfig: add mff alias
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.gitconfig')
-rw-r--r--.gitconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index 2d8bbd0..9eeac27 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,6 +16,7 @@
b = branch -vv
sup = log --all --graph --pretty=format:'%Cblue%h%C(yellow)%d %Creset%s %Cgreen(%cr) %Cred%an%+b'
sp = show --stat -p
+ mff = merge
[merge]
tool = vimdiff
[push]