diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-09-29 03:32:11 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-09-29 23:15:50 -0700 |
| commit | f8babc4dabebebd9e95537df6da0408c1c178615 (patch) | |
| tree | 9b9ef3cd15cf39edc421b6f6b67dc4d256d55e31 /git-rebase--interactive.sh | |
| parent | 2a858ee95134926a0ccccb9a78db06bcb0bd65d0 (diff) | |
| download | git-f8babc4dabebebd9e95537df6da0408c1c178615.tar.gz git-f8babc4dabebebd9e95537df6da0408c1c178615.tar.xz | |
rebase -i: support single-letter abbreviations for the actions
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",
"p" instead of "pick", or "s" instead of "squash".
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-rebase--interactive.sh')
| -rwxr-xr-x | 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 268a629c4..8de5b794b 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) 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) EDIT_COMMIT= USE_OUTPUT=output cp "$MSG" "$SQUASH_MSG" |