summaryrefslogtreecommitdiff
path: root/bin/gitify
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2017-07-02 20:36:58 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2017-07-02 20:36:58 -0400
commit93b69f118eebb3e623c89c51a0639b522ac0d3e0 (patch)
treee017d903e2768e36acb9640252b6adfa59d8b073 /bin/gitify
parentf6fb39d53e854993915264b4613bc9f9de17a059 (diff)
Add appropriate merges
Diffstat (limited to 'bin/gitify')
-rwxr-xr-xbin/gitify8
1 files changed, 8 insertions, 0 deletions
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
}