From: Marc Branchaud <marcnarc@xiplink.com>
Date: Thu, 19 Feb 2009 16:31:11 GMT
Subject: Re: [PATCH 4/4] remote: new show output style
Message-ID: <499D894F.90508@xiplink.com>
In-Reply-To: <bd6139dc0902190816m3c70923eg132e89bff28a216f@mail.gmail.com>

Sverre Rabbelier wrote:
> 
> A non-fast forward update in terms of pushing means you overwrite
> whatever the remote currently has set as that branch's head. This can
> be desirable in a private repository or branch, but is usually not
> desired on shared branches.

Let me see if I understand what you're saying.  If my local repo has

	o--o--o--A--B  <-- origin/thing
	       \
	        X--Y--Z  <-- mystuff

and I do 'git push origin +mystuff:thing', does the origin end up with

	        A--B  <-- (branch with no symbolic reference)
	       /
	o--o--o--X--Y--Z  <-- origin/thing

So commits A and B are basically left dangling?

If that's the case, then I'd say "replaces" or "overwrites" is the right word to use in the 'remote show' output.  But more importantly, I think the 'git push' man page needs to explain this!

		M.