| commit | 1556ef1e373e2928cd0d4a3630f142a57c1f1813 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 4 Dec 2008 23:03:28 +0000 (4 15:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 5 Dec 2008 02:45:01 +0000 (4 18:45 -0800) | ||
| tree | e1be0f42d17f66793b7af763f054479302eacd1f | treesnapshot (tar.gz zip) |
| parent | 123ed6590836405acb4a0c38e2e4c1b06b4e49a9 | commitdiff |
git-am --whitespace: do not lose the command line option
When you start "git am --whitespace=fix" and the patch application process
is interrupted by an unapplicable patch early in the series, after
fixing the offending patch, the remainder of the patch should be processed
still with --whitespace=fix when restarted with "git am --resolved" (or
dropping the offending patch with "git am --skip").
The breakage was introduced by the commit 67dad68 (add -C[NUM] to git-am,
2007-02-08); this should fix it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When you start "git am --whitespace=fix" and the patch application process
is interrupted by an unapplicable patch early in the series, after
fixing the offending patch, the remainder of the patch should be processed
still with --whitespace=fix when restarted with "git am --resolved" (or
dropping the offending patch with "git am --skip").
The breakage was introduced by the commit 67dad68 (add -C[NUM] to git-am,
2007-02-08); this should fix it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-am.sh | diffblobblamehistory |