From: Brian Gesiak <modocache@gmail•com>
To: git@vger•kernel.org
Cc: Brian Gesiak <modocache@gmail•com>
Subject: [PATCH] git-rebase: Teach rebase "-" shorthand.
Date: Tue, 18 Mar 2014 17:44:28 +0900 [thread overview]
Message-ID: <1395132268-69488-1-git-send-email-modocache@gmail.com> (raw)
Teach rebase the same shorthand as checkout and merge; that is, that "-"
means "the branch we were previously on".
Reported-by: Tim Chase <git@tim•thechases.com>
Signed-off-by: Brian Gesiak <modocache@gmail•com>
---
git-rebase.sh | 4 ++++
t/t3400-rebase.sh | 6 ++++++
2 files changed, 10 insertions(+)
diff --git a/git-rebase.sh b/git-rebase.sh
index 5f6732b..2c75e9f 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -453,6 +453,10 @@ then
test "$fork_point" = auto && fork_point=t
;;
*) upstream_name="$1"
+ if test "$upstream_name" = "-"
+ then
+ upstream_name="@{-1}"
+ fi
shift
;;
esac
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index 6d94b1f..00aba9f 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -88,6 +88,12 @@ test_expect_success 'rebase from ambiguous branch name' '
git rebase master
'
+test_expect_success 'rebase using shorthand' '
+ git checkout master
+ git checkout -b shorthand HEAD^
+ GIT_TRACE=1 git rebase -
+'
+
test_expect_success 'rebase a single mode change' '
git checkout master &&
git branch -D topic &&
--
1.8.5.2 (Apple Git-48)
next reply other threads:[~2014-03-18 8:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-18 8:44 Brian Gesiak [this message]
2014-03-18 19:26 ` [PATCH] git-rebase: Teach rebase "-" shorthand Torsten Bögershausen
2014-03-18 19:42 ` Junio C Hamano
2014-03-19 11:02 ` [PATCH v2] " Brian Gesiak
2014-03-19 17:53 ` Junio C Hamano
2014-03-19 18:02 ` John Keeping
2014-03-19 18:09 ` Brian Gesiak
2014-03-19 19:02 ` Junio C Hamano
2014-03-19 19:12 ` John Keeping
2014-03-19 19:41 ` Junio C Hamano
2014-03-19 19:55 ` John Keeping
2014-03-19 21:02 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1395132268-69488-1-git-send-email-modocache@gmail.com \
--to=modocache@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox