diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-12-04 15:03:28 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-12-04 18:45:01 -0800 |
| commit | 1556ef1e373e2928cd0d4a3630f142a57c1f1813 (patch) | |
| tree | e1be0f42d17f66793b7af763f054479302eacd1f /t | |
| parent | Merge branch 'dm/svn-remote' (diff) | |
| download | tgif-1556ef1e373e2928cd0d4a3630f142a57c1f1813.tar.xz | |
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>
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions