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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Tue, 10 Feb 2009, Marc Branchaud wrote:

> 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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux