git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Torsten Bögershausen <tboegi@web.de>
Date
Mar 18, 2014, 19:26 UTC
Message-ID
<53289DE8.2070104@web.de>
In-Reply-To
<1395132268-69488-1-git-send-email-modocache@gmail.com>
On 03/18/2014 09:44 AM, Brian Gesiak wrote:
Show 35 quoted lines
> 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
we schould have the "&&"   ^^
> +	git checkout -b shorthand HEAD^
               we schould have the "&&"  ^^
> +	GIT_TRACE=1 git rebase -
And why the GIT_TRACE ?
Show 6 quoted lines
> +'
> +
>   test_expect_success 'rebase a single mode change' '
>   	git checkout master &&
>   	git branch -D topic &&
>
Previous: Brian GesiakNext: Junio C Hamano
Message 2 of 12 in “git-rebase: Teach rebase "-" shorthand.”
  1. git-rebase: Teach rebase "-" shorthand.Brian Gesiak, Mar 18, 2014
  2. Torsten BögershausenMar 18, 2014
  3. Junio C HamanoMar 18, 2014
  4. git-rebase: Teach rebase "-" shorthand.Brian Gesiak, Mar 19, 2014
  5. Junio C HamanoMar 19, 2014
  6. John KeepingMar 19, 2014
  7. Brian GesiakMar 19, 2014
  8. Junio C HamanoMar 19, 2014
  9. John KeepingMar 19, 2014
  10. Junio C HamanoMar 19, 2014
  11. John KeepingMar 19, 2014
  12. Junio C HamanoMar 19, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.