From a33968be140dba9c01125763328a716aab1ea9f3 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Wed, 13 Aug 2014 00:37:04 +0200
Subject: misc

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

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index 862bb49..d2e3822 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -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
-- 
cgit v1.2.3-24-g4f1b