[PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Brian Gesiak
Teach rebase the same shorthand as checkout and merge; that is, that - means the branch we were previously on. Reported-by: Tim Chase g...@tim.thechases.com Signed-off-by: Brian Gesiak modoca...@gmail.com --- git-rebase.sh | 4 t/t3400-rebase.sh | 11 +++ 2 files changed, 15

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
Brian Gesiak modoca...@gmail.com writes: diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh index 6d94b1f..6176754 100755 --- a/t/t3400-rebase.sh +++ b/t/t3400-rebase.sh @@ -88,6 +88,17 @@ test_expect_success 'rebase from ambiguous branch name' ' git rebase master '

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread John Keeping
On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase - with your change still says something like this: First, rewinding head to replay your work on top of it... Fast-forwarded HEAD to @{-1}. instead of Fast-forwarded HEAD to -. Somebody may later

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Brian Gesiak
Thank you for the feedback and tweaks! Is the eye-candy output to the standard output what is the most interesting during the execution of a rebase? Wouldn't we be more interested to make sure that we did transplant the history on the same commit between two cases? I agree. I'll consult the

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase - with your change still says something like this: First, rewinding head to replay your work on top of it... Fast-forwarded HEAD to @{-1}. instead of

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread John Keeping
On Wed, Mar 19, 2014 at 12:02:01PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase - with your change still says something like this: First, rewinding head to replay your work on top

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 12:02:01PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase - with your change still says something like this: First,

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread John Keeping
On Wed, Mar 19, 2014 at 12:41:31PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 12:02:01PM -0700, Junio C Hamano wrote: John Keeping j...@keeping.me.uk writes: On Wed, Mar 19, 2014 at 10:53:01AM -0700, Junio C Hamano wrote: rebase

Re: [PATCH v2] git-rebase: Teach rebase - shorthand.

2014-03-19 Thread Junio C Hamano
John Keeping j...@keeping.me.uk writes: I thought your suggestion was: 'rebase @{-1}' says 'Fast-fowarded HEAD to @{-1}'. It should say 'Fast-forwarded HEAD to 4f407407 (rebase: allow - short-hand for the previous branch, 2014-03-19)' instead. Or it could be: 'rebase