Re: git and bzr
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Nov 29, 2006, 10:52 UTC
- Message-ID
- <Pine.LNX.4.63.0611291149440.30004@wbgn013.biozentrum.uni-wuerzburg.de>
- In-Reply-To
- <Pine.LNX.4.64.0611281413310.4244@woody.osdl.org>
Hi,
On Tue, 28 Nov 2006, Linus Torvalds wrote:
Show 11 quoted lines
> On Tue, 28 Nov 2006, Nicholas Allen wrote: > > > > All useful conflict status is lost isn't it? > > No, it's actually there, but "git status" doesn't really explain it to > you. > > The go-to command tends to be "git diff", which after a merge will not > show anything that already merged correctly (because it will have been > updated in the git index _and_ updated in the working tree, so there will > be no diff from stuff that auto-merged).
This is actually the most meaningful argument for not hiding the index. Usually I explain it to people as a "staging area" standing between your working directory, and the next committed state.
But I will start explaining the index with "what if your merge failed?".
Ciao, Dscho