From: Michael Ellerman <mpe@ellerman.id.au>
Date: Fri, 19 Jun 2015 05:41:41 +0000 (+1000)
Subject: merge_helper: Split the merge gitk logic into a separate script
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=448da8b3bb9675dd51f9600f2bf515fe57f57534;p=next-scripts

merge_helper: Split the merge gitk logic into a separate script
---

diff --git a/merge_helper b/merge_helper
new file mode 100755
index 0000000..36c719c
--- /dev/null
+++ b/merge_helper
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+branch=""
+[ "$1" = "-t" ] && {
+        branch="-t $2"
+        shift 2
+}
+
+file="$*"
+
+gitk --merge -- $file &
+[ "$file" ] && gvim $file 2>/dev/null