From: Linus Torvalds <torvalds@osdl.org>
To: Junio C Hamano <junkio@cox.net>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] diff-cache/tree compatible output for show-diff (take 2).
Date: Tue, 26 Apr 2005 17:29:12 -0700 (PDT) [thread overview]
Message-ID: <Pine.LNX.4.58.0504261725470.18901@ppc970.osdl.org> (raw)
In-Reply-To: <Pine.LNX.4.58.0504261719230.18901@ppc970.osdl.org>
On Tue, 26 Apr 2005, Linus Torvalds wrote:
>
> [ "U" for "unmerged" ]
>
> Btw, diff-cache definitely _can_ output this form, so we probably should
> make diff-cache do so too, to match, no?
Actually, we should decide on what diff-tree-helper does before that.
Right now it always either calls out to the external diff program, or it
says "cannot parse".
It's possible that an external "diff" program might actually want to know
about unmerged files (maybe people don't actually do "diff", but something
else altogether), so one approach might be to just make that an option.
The other approach is to just have something like "<pathname> is unmerged"
as output from diff-tree-helper. That isn't quite as flexible, but it sure
is simpler..
Linus
next prev parent reply other threads:[~2005-04-27 0:22 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1113400651.20848.135.camel@hades.cambridge.redhat.com>
2005-04-24 5:09 ` [GIT PATCH] Selective diff-tree Linus Torvalds
2005-04-24 6:25 ` David Woodhouse
2005-04-24 17:15 ` Linus Torvalds
2005-04-24 7:40 ` Junio C Hamano
2005-04-24 17:20 ` Linus Torvalds
2005-04-25 5:12 ` [PATCH 0/2] diff-tree/diff-cache helper Junio C Hamano
2005-04-25 5:15 ` [PATCH 1/2] Split external diff command interface to a separate file Junio C Hamano
2005-04-25 5:17 ` [PATCH 2/2] Introduce diff-tree-helper Junio C Hamano
2005-04-26 1:38 ` [PATCH 0/2] diff-tree/diff-cache helper Linus Torvalds
2005-04-26 2:08 ` Nicolas Pitre
2005-04-26 7:39 ` Junio C Hamano
2005-04-26 7:57 ` [PATCH] Diff-tree-helper take two Junio C Hamano
2005-04-26 22:27 ` [PATCH] Add -r flag to show-diff for diff-cache/diff-tree like output Junio C Hamano
2005-04-26 22:40 ` Linus Torvalds
2005-04-26 23:05 ` Junio C Hamano
2005-04-26 23:44 ` Linus Torvalds
2005-04-27 0:05 ` Junio C Hamano
2005-04-27 0:22 ` Linus Torvalds
2005-04-26 23:45 ` [PATCH] diff-cache/tree compatible output for show-diff (take 2) Junio C Hamano
2005-04-27 0:20 ` Linus Torvalds
2005-04-27 0:29 ` Linus Torvalds [this message]
[not found] ` <Pine.LNX.4.58.0504261750030.18901@ppc970.osdl.org>
2005-04-27 1:09 ` Linus Torvalds
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.58.0504261725470.18901@ppc970.osdl.org \
--to=torvalds@osdl.org \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).