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

Marc Branchaud schrieb:

Jay Soffian wrote:

quoted

* 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)

I find this form more useful than the one below because of the clear
separation into remote an local branchs.

How about something a bit tighter, merging the local branch list with the remote branch list:

* remote origin
  URL: git://git.kernel.org/pub/scm/git/git.git
  Remote branches:
    html      Not tracked
    master    Tracked by local branches:
                master (merges)
                mywork (rebases)
    next      Tracked by local branch:
                wip/remote-HEAD (rebases)
    pu        Tracked by local branch:
                pu (merges)
    todo      Not tracked
    old-next  Stale (would prune)

-- Hannes