Meta/Reintegrate: show what happened during the fix-up
Junio C Hamano committed
Oct 24, 2014 at 15:26 UTC
86b0be18d61512aba73c84b6256752273cf73ebf
1 file changed
+1
Reintegrate
+1
@@ -167,6 +167,7 @@ no)
167
then
168
echo >&2 "Fixing up the merge"
169
git cherry-pick --no-commit "refs/merge-fix/$branch" &&
170
+ git diff --stat HEAD &&
171
EDITOR=: git commit --amend -a || exit
172
fi
173
;;