From 3e5057a8b4499f7b000cd465a3adf6ef22b89f2a Mon Sep 17 00:00:00 2001 From: Nanako Shiraishi Date: Wed, 16 Jul 2008 19:39:10 +0900 Subject: [PATCH] git am --abort After failing to apply patches in the middle of a series, "git am --abort" lets you go back to the original commit. [jc: doc/help update from Olivier, and fixups for "am -3" squashed in] Signed-off-by: Nanako Shiraishi Signed-off-by: Olivier Marin Signed-off-by: Junio C Hamano --- Documentation/git-am.txt | 5 +++- git-am.sh | 21 ++++++++++++--- t/t4151-am-abort.sh | 56 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 5 deletions(-) create mode 100755 t/t4151-am-abort.sh diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt index 2d7f162594..e010a16493 100644 --- a/Documentation/git-am.txt +++ b/Documentation/git-am.txt @@ -13,7 +13,7 @@ SYNOPSIS [--3way] [--interactive] [--binary] [--whitespace=