From: Liam Beguin <liambeguin@gmail.com>
To: git@vger.kernel.org
Cc: Johannes.Schindelin@gmx.de, peff@peff.net,
Liam Beguin <liambeguin@gmail.com>
Subject: [PATCH v3 3/6] rebase -i: add short command-name in --autosquash
Date: Tue, 2 May 2017 00:00:45 -0400 [thread overview]
Message-ID: <20170502040048.9065-4-liambeguin@gmail.com> (raw)
In-Reply-To: <20170502040048.9065-1-liambeguin@gmail.com>
teach `git rebase -i` to recognise short command-names when using the
'--autosquash' option. This allows commit with titles beginning with
"s! ..." and "f! ..." to be treated the same way as "squash! ..." and
"fixup! ..." respectively.
Signed-off-by: Liam Beguin <liambeguin@gmail.com>
---
Documentation/git-rebase.txt | 2 ++
git-rebase--interactive.sh | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 53f4e144444a..3e49d8b046ca 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -437,6 +437,8 @@ without an explicit `--interactive`.
commit from `pick` to `squash` (or `fixup`). Ignores subsequent
"fixup! " or "squash! " after the first, in case you referred to an
earlier fixup/squash with `git commit --fixup/--squash`.
+ Note that their short counterparts, namely "s! ..." and "f! ..."
+ behave the same way.
+
This option is only valid when the `--interactive` option is used.
+
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 4fa621062cdf..61450064c5c4 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -790,7 +790,7 @@ rearrange_squash () {
do
test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1})
case "$message" in
- "squash! "*|"fixup! "*)
+ "squash! "*|"s! "*|"fixup! "*|"f! "*)
action="${message%%!*}"
rest=$message
prefix=
@@ -798,7 +798,7 @@ rearrange_squash () {
while :
do
case "$rest" in
- "squash! "*|"fixup! "*)
+ "squash! "*|"s! "*|"fixup! "*|"f! "*)
prefix="$prefix${rest%%!*},"
rest="${rest#*! }"
;;
--
2.9.3
next prev parent reply other threads:[~2017-05-02 4:01 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-02 4:00 [PATCH v3 0/6] rebase -i: add config to abbreviate command-names Liam Beguin
2017-05-02 4:00 ` [PATCH v3 1/6] rebase -i: add abbreviated command-names handling Liam Beguin
2017-05-02 14:37 ` Johannes Schindelin
2017-05-02 4:00 ` [PATCH v3 2/6] rebase -i: add abbreviate_commands function Liam Beguin
2017-05-02 15:32 ` Johannes Schindelin
2017-05-02 4:00 ` Liam Beguin [this message]
2017-05-02 15:34 ` [PATCH v3 3/6] rebase -i: add short command-name in --autosquash Johannes Schindelin
2017-05-02 23:18 ` Liam Beguin
2017-05-02 4:00 ` [PATCH v3 4/6] Documentation: move rebase.* config variables to a separate rebase-config.txt Liam Beguin
2017-05-02 15:40 ` Johannes Schindelin
2017-05-02 4:00 ` [PATCH v3 5/6] Documentation: use preferred name for the 'todo list' script Liam Beguin
2017-05-02 4:00 ` [PATCH v3 6/6] Documentation: document the rebase.abbreviateCommands option Liam Beguin
2017-05-02 8:48 ` [PATCH v3 0/6] rebase -i: add config to abbreviate command-names Ævar Arnfjörð Bjarmason
2017-05-02 15:41 ` Johannes Schindelin
2017-05-02 15:48 ` Johannes Schindelin
2017-05-02 23:56 ` Liam Beguin
2017-05-03 11:22 ` Johannes Schindelin
2017-05-04 5:04 ` Junio C Hamano
2017-05-07 17:13 ` Liam Beguin
2017-05-08 0:27 ` Junio C Hamano
2017-05-08 21:27 ` Liam Beguin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170502040048.9065-4-liambeguin@gmail.com \
--to=liambeguin@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).