Re: [PATCH] Make 'remote show' distinguish between merged and rebased remote branches

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 10, 2009, 21:22 UTC
Message-ID: <alpine.DEB.1.00.0902102220550.10279@pacific.mpi-cbg.de>
In-Reply-To: <20090210202046.8EBEC3360AC@rincewind>

Hi,

On Tue, 10 Feb 2009, Marc Branchaud wrote:

Show 10 quoted lines

> 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

I'm not a native speaker... but "rebased with" sounds wrong, but so does "Remote branch rebased onto with 'git pull' while on branch rebaser"...

Otherwise, the patch looks good to me.

Thanks, Dscho