From c17e59bf1765d3b847b50e403de6b8a36ee9ebb6 Mon Sep 17 00:00:00 2001
From: Barak Michener <me@barakmich.com>
Date: Mon, 8 Apr 2013 11:11:57 -0400
Subject: [PATCH] Add ours/theirs

---
 .gitconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index a5019d1..f10c4f1 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -13,6 +13,8 @@
   sdiff = diff --staged
   graph = log --graph --oneline
   submodule-pull = submodule foreach git pull 
+  ours   = "!f() { git checkout --ours $@ && git add $@; }; f"
+  theirs = "!f() { git checkout --theirs $@ && git add $@; }; f"
 
 [diff]  
   renamelimit = 0