Mdiff: Show diff that a merge brings to mainline

a8917339 · Kirill Smelkov · 7ee60de7 · a8917339 · a8917339
Commit a8917339 authored May 12, 2016 by Kirill Smelkov
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

bin/M bin/M +1 -1

bin/Mdiff bin/Mdiff +7 -0

No files found.
--- a/bin/M
+++ b/bin/M
 #!/bin/sh

 # M <merge-sha1>
-# show what was merged
+# show what was merged in gitk

 M=$1
 gitk $M~..$M^2
--- a/bin/Mdiff
+++ b/bin/Mdiff
+#!/bin/sh
+
+# Mdiff <merge-sha1>
+# show diff that a merge brings to mainline
+
+M=$1
+git diff $M~...$M^2