From b6536f3061803085d4dcb9f4c8b36be62bab0330 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami@samhuri.net>
Date: Wed, 10 Jun 2015 10:46:14 -0700
Subject: [PATCH] add some more git commands

---
 git-diff-merge-conflict-resolution |  3 +++
 git-remove-merged-branches         | 12 ++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100755 git-diff-merge-conflict-resolution
 create mode 100755 git-remove-merged-branches

diff --git a/git-diff-merge-conflict-resolution b/git-diff-merge-conflict-resolution
new file mode 100755
index 0000000..f5c19ae
--- /dev/null
+++ b/git-diff-merge-conflict-resolution
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+git diff-tree --cc $1
diff --git a/git-remove-merged-branches b/git-remove-merged-branches
new file mode 100755
index 0000000..599bab1
--- /dev/null
+++ b/git-remove-merged-branches
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+REMOTE="${1:-origin}"
+BRANCH="${2:-master}"
+
+git branch -r --merged |
+  grep "\b${REMOTE}/" |
+  grep -vE "HEAD|master|${BRANCH}" |
+  xargs -L1 |
+  sed -e "s/${REMOTE}\///" |
+  xargs git push "$REMOTE" --delete
+ 
\ No newline at end of file