mlsteele · February 12, 2019 20:49
diff --git a/justmerged b/justmerged
 #!/usr/bin/env bash
 # You just ran `git merge origin/master`. But what happened?
 # Shows the diff between
 # - your changes from old master before merging
 # - your changes from NEW master AFTER  merging
 COMMON_ANCESTOR=$(git merge-base $(git show -s --pretty=%P HEAD))
 git d $COMMON_ANCESTOR..HEAD^1 > /tmp/diff1.txt
 git d HEAD^2..HEAD > /tmp/diff2.txt
 kdiff3 /tmp/diff{1,2}.txt
	#!/usr/bin/env bash
	# You just ran `git merge origin/master`. But what happened?
	# Shows the diff between
	# - your changes from old master before merging
	# - your changes from NEW master AFTER merging
	COMMON_ANCESTOR=$(git merge-base $(git show -s --pretty=%P HEAD))
	git d $COMMON_ANCESTOR..HEAD^1 > /tmp/diff1.txt
	git d HEAD^2..HEAD > /tmp/diff2.txt
	kdiff3 /tmp/diff{1,2}.txt