From: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
To: Jakub Narebski <jnareb@gmail.com>, junkio@cox.net
Cc: ae@op5.se, torvalds@linux-foundation.org, mdw@distorted.org.uk,
peff@peff.net, raa.lkml@gmail.com, spearce@spearce.org,
git@vger.kernel.org
Subject: Re: Deprecation/Removal schedule
Date: Wed, 07 Feb 2007 10:33:11 +0100 [thread overview]
Message-ID: <20070207093311.258490@gmx.net> (raw)
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
next prev parent reply other threads:[~2007-02-07 9:33 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-02-05 6:48 Deprecation/Removal schedule Junio C Hamano
2007-02-05 6:57 ` Shawn O. Pearce
2007-02-05 9:33 ` Jakub Narebski
2007-02-05 10:11 ` Jakub Narebski
2007-02-05 10:25 ` Shawn O. Pearce
2007-02-05 15:50 ` Alex Riesen
2007-02-05 19:45 ` Shawn O. Pearce
2007-02-05 22:49 ` Alex Riesen
2007-02-05 22:55 ` Shawn O. Pearce
2007-02-06 10:20 ` Alex Riesen
2007-02-06 10:45 ` Johannes Schindelin
2007-02-06 11:00 ` Jeff King
2007-02-06 11:03 ` Johannes Schindelin
2007-02-06 13:09 ` Alex Riesen
2007-02-06 13:24 ` Johannes Schindelin
2007-02-06 13:32 ` Alex Riesen
2007-02-06 13:01 ` Alex Riesen
2007-02-05 12:00 ` Mark Wooding
2007-02-05 12:45 ` Johannes Schindelin
2007-02-05 15:53 ` Alex Riesen
2007-02-05 16:26 ` Linus Torvalds
2007-02-05 17:56 ` Junio C Hamano
2007-02-05 19:24 ` [PATCH] Add --patchdepth parameter to git-am.sh Andy Parkins
2007-02-05 19:37 ` Shawn O. Pearce
2007-02-07 8:27 ` Junio C Hamano
2007-02-07 9:44 ` Jakub Narebski
2007-02-07 9:59 ` Andy Parkins
2007-02-06 14:55 ` Deprecation/Removal schedule Andreas Ericsson
2007-02-06 15:26 ` Alex Riesen
2007-02-06 15:33 ` Johannes Schindelin
2007-02-07 7:12 ` Junio C Hamano
2007-02-07 8:33 ` Jakub Narebski
2007-02-07 9:33 ` Johannes Schindelin [this message]
2007-02-07 10:13 ` Jakub Narebski
2007-02-07 9:37 ` Junio C Hamano
2007-02-07 11:10 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070207093311.258490@gmx.net \
--to=johannes.schindelin@gmx.de \
--cc=ae@op5.se \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=junkio@cox.net \
--cc=mdw@distorted.org.uk \
--cc=peff@peff.net \
--cc=raa.lkml@gmail.com \
--cc=spearce@spearce.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.