From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Feb 2009 21:17:07 GMT
Subject: Re: [PATCH] Make 'remote show' distinguish between merged and rebased remote branches
Message-ID: <7v3aemm1po.fsf@gitster.siamese.dyndns.org>
In-Reply-To: <20090210202046.8EBEC3360AC@rincewind>

Marc Branchaud <marcnarc@xiplink.com> writes:

> Prints "rebased" instead of "merged" if branch.<name>.rebase is true.
>
> Signed-off-by: Marc Branchaud <marcnarc@xiplink.com>
> ...
> diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
> index 1f59960..be0316a 100755
> --- a/t/t5505-remote.sh
> +++ b/t/t5505-remote.sh
> @@ -112,6 +112,8 @@ cat > test/expect << EOF
>    URL: $(pwd)/one
>    Remote branch merged with 'git pull' while on branch master
>      master
> +  Remote branch rebased with 'git pull' while on branch rebaser
> +    side
>    New remote branch (next fetch will store in remotes/origin)
>      master
>    Tracked remote branches

I sympathize with what you are trying to do but I do not think this is
correct.  You will *never* rebase remote on top of your changes; rather
you will replay your changes on top of what the updated remote has.

It is more like "if you start git pull while on branch rebaser, it will
rebased on top of this branch from the remote".