From 1bf05d62092a1cc3f9fe9e7d6423aff01dc32f7b Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 8 Aug 2013 14:47:30 +0200
Subject: gitconfig: add mff alias

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .gitconfig | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitconfig')

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]
-- 
cgit v1.2.3-24-g4f1b