From 93b69f118eebb3e623c89c51a0639b522ac0d3e0 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sun, 2 Jul 2017 20:36:58 -0400
Subject: Add appropriate merges

---
 bin/gitify | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'bin/gitify')

diff --git a/bin/gitify b/bin/gitify
index 80f85af..d8ce9b0 100755
--- a/bin/gitify
+++ b/bin/gitify
@@ -78,6 +78,14 @@ main() {
 			if [[ "$branch" != *.OLD ]]; then
 				lastbranch="$branch"
 			fi
+			if [[ "$branch" == PROGRAMS/CVTUTF ]] && git log -n1 --stat|grep -qF 'ExpectedOutput.txt'; then
+				git filter-branch -f --parent-filter 'cat; echo " -p BETA/CVTUTF-1-3"' HEAD^..HEAD
+				git update-ref -d refs/original/refs/heads/"$branch"
+			fi
+			if [[ "$branch" == PROGRAMS/CVTUTF.OLD ]] && git log -n1 --stat|grep -qi '.*\.c\s'; then
+				git filter-branch -f --parent-filter 'cat; echo " -p PROGRAMS/CVTUTF^"' HEAD^..HEAD
+				git update-ref -d refs/original/refs/heads/"$branch"
+			fi
 		fi
 	done
 }
-- 
cgit v1.2.3-2-g168b