From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Wed, 07 Feb 2007 09:33:11 GMT
Subject: Re: Deprecation/Removal schedule
Message-ID: <20070207093311.258490@gmx.net>
In-Reply-To: <200702070933.21804.jnareb@gmail.com>

Hi,

Jakub wrote:

> Junio C Hamano wrote:
> 
> > In 1.5.0, you will still see git-resolve and git-diff-stages,
> > but they will be removed by 1.5.1.
> 
> Well, it is not as if we cannot obtain equivalent of git-diff-stages
> without this command. Stages are <ours>, <theirs> and <ancestor>
> (git-merge-base <ours> <theirs>) so I think we can use git-diff-tree
> with appropriate arguments...

Not exactly. The stages are in the index. For example, when you have conflicts, the stages might not reflect _any_ tree at all! This is because _part_ of the changes could be merged, and _part_ of the changes conflict.

But it does not matter anyway. Good bye diff-stages!

Ciao,
Dscho

-- 
Der GMX SmartSurfer hilft bis zu 70% Ihrer Onlinekosten zu sparen! 
Ideal für Modem und ISDN: http://www.gmx.net/de/go/smartsurfer