[PATCH] rebase -i: support single-letter abbreviations for the actions
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:43:37
Subsystem:
the rest · Maintainer:
Linus Torvalds
When you do many rebases, you can get annoyed by having to type out the actions "edit" or "squash" in total. This commit helps that, by allowing you to enter "e" instead of "edit", or "s" instead of "squash", and it also plays nice with "merge" or "amend" as synonyms to "squash". Signed-off-by: Johannes Schindelin <redacted> --- git-rebase--interactive.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 823291d..0f9483e 100755
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh@@ -232,14 +232,14 @@ do_next () { '#'*|'') mark_action_done ;; - pick) + pick|p) comment_for_reflog pick mark_action_done pick_one $sha1 || die_with_patch $sha1 "Could not apply $sha1... $rest" ;; - edit) + edit|e) comment_for_reflog edit mark_action_done
@@ -254,7 +254,7 @@ do_next () { warn exit 0 ;; - squash) + squash|s|merge|m|amend|a) comment_for_reflog squash has_action "$DONE" ||
@@ -263,7 +263,7 @@ do_next () { mark_action_done make_squash_message $sha1 > "$MSG" case "$(peek_next_command)" in - squash) + squash|s|merge|m|amend|a) EDIT_COMMIT= USE_OUTPUT=output cp "$MSG" "$SQUASH_MSG"
--
1.5.3.2.1102.g9487