From: Jeff King <peff@peff.net>
Date: Tue, 17 Mar 2009 08:24:57 GMT
Subject: Re: Not pushing all branches?
Message-ID: <20090317082457.GG18475@coredump.intra.peff.net>
In-Reply-To: <874oxwgbcr.fsf@catnip.gol.com>

On Sat, Mar 14, 2009 at 10:08:20AM +0900, Miles Bader wrote:

> e.g., "git diff REMOTE_BRANCH" to see what updates are pending if I
> merge...  Also, it would be nice to have a more concise way to say
> "git merge REMOTE_BRANCH".
> 
> I'm not sure "-" seems like the best syntax though... maybe it's a bit
> _too_ short.
> 
> [Is there a general standard syntax for "keywords" in git, e.g., to
> distinguish them from branch/rev names?  I mean, if the standard syntax
> were "@foo", then one could imagine "git diff @remote" or something.]

I think all-caps is the closest we get. E.g., you probably don't want to
name a branch MERGE_HEAD, ORIG_HEAD, FETCH_HEAD, etc. But it's purely
advisory; you _can_ make such branches and then deal with the ensuing
"ambiguous ref" messages.

-Peff