From: Jakub Narebski <jnareb@gmail.com>
Date: Wed, 07 Feb 2007 10:13:31 GMT
Subject: Re: Deprecation/Removal schedule
Message-ID: <200702071113.31938.jnareb@gmail.com>
In-Reply-To: <20070207093311.258490@gmx.net>

Johannes Schindelin wrote:
> Jakub Narebski 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!

Hmmm... I do wonder if git-diff-stages precedes introduction of combined 
diff format...

-- 
Jakub Narebski
Poland