{"thread":{"id":"14678","subject":"[PATCH] git-am: Mention --abort in usage string part of OPTIONS_SPEC","startedAt":"2008-07-25T18:22:23Z","lastAt":"2008-07-25T18:22:23Z","messageCount":1,"participants":["Stephan Beyer"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"84916","messageId":"1217010143-15765-1-git-send-email-s-beyer@gmx.net","threadId":"14678","inReplyTo":null,"subject":"[PATCH] git-am: Mention --abort in usage string part of OPTIONS_SPEC","fromName":"Stephan Beyer","fromEmail":"s-beyer@gmx.net","sentAt":"2008-07-25T18:22:23Z","receivedAt":"2008-07-25T18:22:23Z","isPatch":true,"sender":{"key":"s-beyer@gmx.net","avatar":"https://avatars.githubusercontent.com/u/143889?v=4"},"body":"The three separate lines for --skip, --resolved and --abort\nare merged into one so that it is easy to see that they're\nalternative and related options.\n\nSigned-off-by: Stephan Beyer <s-beyer@gmx.net>\n---\n\nI could've sworn this had already been in fcab40a38 (git am --abort)\nbut it wasn't. So here it is.\n\nRegards.\n\n git-am.sh |    3 +--\n 1 files changed, 1 insertions(+), 2 deletions(-)\n\ndiff --git a/git-am.sh b/git-am.sh\nindex f4abd9d..6aa8192 100755\n--- a/git-am.sh\n+++ b/git-am.sh\n@@ -6,8 +6,7 @@ SUBDIRECTORY_OK=Yes\n OPTIONS_KEEPDASHDASH=\n OPTIONS_SPEC=\"\\\n git am [options] [<mbox>|<Maildir>...]\n-git am [options] --resolved\n-git am [options] --skip\n+git am [options] (--resolved | --skip | --abort)\n --\n d,dotest=       (removed -- do not use)\n i,interactive   run interactively\n-- \n1.6.0.rc0.106.g0f5bf\n"}]}