diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-12-21 10:35:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-21 11:16:28 -0800 |
| commit | 7b3b7e37581fb5266a260687c21af1571b4ade81 (patch) | |
| tree | 62f8028ae58d7b6d6d6b372b9cd0b1e692fb6e44 /xdiff-interface.c | |
| parent | gitweb: Include links to feeds in HTML header only for '200 OK' response (diff) | |
| download | tgif-7b3b7e37581fb5266a260687c21af1571b4ade81.tar.xz | |
am --abort: keep unrelated commits since the last failure and warn
After making commits (either by pulling or doing their own work) after a
failed "am", the user will be reminded by next "am" invocation that there
was a failed "am" that the user needs to decide to resolve or to get rid
of the old "am" attempt. The "am --abort" option was meant to help the
latter. However, it rewinded the HEAD back to the beginning of the failed
"am" attempt, discarding commits made (perhaps by mistake) since.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions