From: Jay Soffian <jaysoffian@gmail.com>
Date: Tue, 10 Feb 2009 23:13:52 GMT
Subject: Re: [PATCH] Make 'remote show' distinguish between merged and rebased remote branches
Message-ID: <76718490902101513i504e515ocb4a2d789ba520f0@mail.gmail.com>
In-Reply-To: <4991FA18.1040200@xiplink.com>

On Tue, Feb 10, 2009 at 5:05 PM, Marc Branchaud <marcnarc@xiplink.com> wrote:
> I'm happy to use more accurate phrasing -- I was just going for a minimal change.
>
> How about the following, consistent for both cases:
>
> 'git pull' merges branch master with remote branch
>  master
> 'git pull' rebases branch rebaser on top of remote branch
>  side
>
> ?
>
> I like the above because the keywords & branch names are in consistent locations, making it easier to parse the output.

The output of git remote show seems much too verbose for the
information it provides. Something like this, I think, provides the
same information in much less space:

* remote origin
  URL: git://git.kernel.org/pub/scm/git/git.git
  Remote branches:
    html      Not tracked
    maint     Tracked
    man       Tracked
    master    Tracked
    next      Tracked
    pu        Tracked
    todo      Not tracked
    old-next  Stale (would prune)
  Local branches configured to pull from this remote:
    master           upstream is master (merges)
    wip/remote-HEAD  upstream is next   (rebases)

When run with "-n" the status column would be blank or say "Status not
available with -n".

$0.02. :-)

j.