| commit | 240bfd2de9a7aec31240300ba1d7e89c59dbafe9 | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Tue, 4 Aug 2015 13:51:32 +0000 (4 21:51 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 5 Aug 2015 05:02:11 +0000 (4 22:02 -0700) | ||
| tree | 5560a618cc3f14e7a1e353556591a8452513f3ce | treesnapshot (tar.gz zip) |
| parent | 32a5fcbfe9e9436224278ec7eb137b0f2905928d | commitdiff |
builtin-am: implement --resolved/--continue
Since 0c15cc9 (git-am: --resolved., 2005-11-16), git-am supported
resuming from a failed patch application. The user will manually apply
the patch, and the run git am --resolved which will then commit the
resulting index. Re-implement this feature by introducing am_resolve().
Since it makes no sense for the user to run am --resolved when there is
no session in progress, we error out in this case.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Since 0c15cc9 (git-am: --resolved., 2005-11-16), git-am supported
resuming from a failed patch application. The user will manually apply
the patch, and the run git am --resolved which will then commit the
resulting index. Re-implement this feature by introducing am_resolve().
Since it makes no sense for the user to run am --resolved when there is
no session in progress, we error out in this case.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/am.c | diffblobblamehistory |