diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-01-21 16:51:18 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-01-21 16:51:18 -0800 |
commit | 07adc43f3a17a34111e17eadef3f6f4eef3eb67a (patch) | |
tree | ab70e6cab3eaa71d3d1c7dec86fa9c703ed1d6f7 | |
parent | d9fde065bd808fbbad3b53e10e160c8f8193b577 (diff) | |
parent | 4d2e283a1ecda43de9b5cafea27b68a08dfd5767 (diff) | |
download | git-07adc43f3a17a34111e17eadef3f6f4eef3eb67a.tar.gz |
Merge branch 'jf/am-failure-report'
* jf/am-failure-report:
git-am: re-fix the diag message printing
git-am: Make it easier to see which patch failed
-rwxr-xr-x | git-am.sh | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -510,7 +510,7 @@ do fi if test $apply_status != 0 then - echo Patch failed at $msgnum. + printf 'Patch failed at %s %s\n' "$msgnum" "$FIRSTLINE" stop_here_user_resolve $this fi |