X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-merge.sh;h=af1f25b3c51d197ea5fd24b7623dfb591f867133;hb=b3ca4e4ebba6915ea534c4b82cfc5d6f10b4c283;hp=b834e79c98af51a9f3ad4927a2d11c999349b0e4;hpb=50ac7408018209a2829b7948119270fec7e14ec8;p=git.git diff --git a/git-merge.sh b/git-merge.sh index b834e79c..af1f25b3 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -55,8 +55,7 @@ finish () { case "$no_summary" in '') - git-diff-tree -p -M "$head" "$1" | - git-apply --stat --summary + git-diff-tree -p --stat --summary -M "$head" "$1" ;; esac }