From: Jay Soffian <jaysoffian@gmail.com>
Date: Thu, 19 Feb 2009 17:59:52 GMT
Subject: Re: [PATCH 4/4] remote: new show output style
Message-ID: <76718490902190959y38685453h52d29bc4e5daac3a@mail.gmail.com>
In-Reply-To: <76718490902190957td40d425p6b2ae1242060114d@mail.gmail.com>

On Thu, Feb 19, 2009 at 12:57 PM, Jay Soffian <jaysoffian@gmail.com> wrote:
> I tried out a few different option and none was very satisfactory to me.
>
> 1)
>    master            rebases onto remote master
>    another-branch    merges with remote  next
>    some-other-branch rebases onto remote master
>
> Here, the unaligned "with" and "onto" is ugly.
>
> 2)
>
>    master            rebases onto remote master
>    another-branch    merges  with remote next
>    some-other-branch rebases onto remote master

I also had a version that used the word "upstream" instead of remote,
and another that put the actual remote name in place. e.g.

 master merges with upstream master
 master merges with origin master  (assuming remote is "origin" of course.)

j.