| commit | 3727531899aecac02c50c6580e84c627c25fcaa6 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Fri, 22 Jul 2005 23:04:19 +0000 (22 16:04 -0700) | ||
| committer | Linus Torvalds <torvalds@g5.osdl.org> | |
| Fri, 22 Jul 2005 23:29:28 +0000 (22 16:29 -0700) | ||
| tree | 95d1bda217cd49e27eed13363de01af3a6e7465a | treesnapshot (tar.gz zip) |
| parent | d854f783af2a441827d66b4b70e9d0d9e3434b15 | commitdiff |
[PATCH] tools/applymbox: allow manual fixing and continuing after a failure.
With "-c .dotest/0002" flag, the applymbox command can be told
to use existing .dotest/patch file after hand-fixing the patch
conflicts for the second patch in the mailbox, and continue on
from that message, skipping the already applied first patch in
.dotest/0001.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
With "-c .dotest/0002" flag, the applymbox command can be told
to use existing .dotest/patch file after hand-fixing the patch
conflicts for the second patch in the mailbox, and continue on
from that message, skipping the already applied first patch in
.dotest/0001.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| tools/applymbox | diffblobblamehistory |