diff options
| author | Paul Tan <pyokagan@gmail.com> | 2015-08-04 21:51:32 +0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-04 22:02:11 -0700 |
| commit | 240bfd2de9a7aec31240300ba1d7e89c59dbafe9 (patch) | |
| tree | 5560a618cc3f14e7a1e353556591a8452513f3ce /t/t4013/diff.format-patch_--inline_--stdout_initial..side | |
| parent | builtin-am: refuse to apply patches if index is dirty (diff) | |
| download | git-240bfd2de9a7aec31240300ba1d7e89c59dbafe9.tar.gz git-240bfd2de9a7aec31240300ba1d7e89c59dbafe9.zip | |
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>
Diffstat (limited to 't/t4013/diff.format-patch_--inline_--stdout_initial..side')
0 files changed, 0 insertions, 0 deletions