Hi,
layer wrote:
> I'm trying to simulate the output that comes at the end of the merge:
Cheating answer:
Hmm, I wonder how the scripted version did that.
$ git grep -Oless -eFast-forward -- contrib/examples/git-merge.sh
msg="Fast-forward"
if test -n "$have_message"
then
msg="$msg (no commit created; -m option ignored)"
fi
new_head=$(git rev-parse --verify "$1^0") &&
git read-tree -v -m -u --exclude-per-directory=.gitignore $head "$new_head" &&
finish "$new_head" "$msg" || exit
dropsave
exit 0
;;
[ok, it's the finish function. press q to exit the pager, and]
$ git grep -Oless -F -e'finish ()' -- contrib/examples/git-merge.sh
finish () {
if test '' = "$2"
[...]
if test "$show_diffstat" = t
then
# We want color (if set), but no pager
GIT_PAGER='' git diff --stat --summary -M "$head" "$1"
[...]
So apparently
git diff --stat --summary -M <before> <after>
will take care of it.
On the other hand, if you want diff output for a single commit (i.e.,
"somewhat like git rev-list --pretty --summary --stat --no-walk but no
commit messages"), then some variation on
git diff-tree --color --cc --summary --stat --no-commit-id origin/pu
might bring some joy.
Hope that helps,
Jonathan
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html