From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Steffen Prohaska <prohaska@zib.de>,
Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] Also use unpack_trees() in do_diff_cache()
Date: Sun, 20 Jan 2008 23:34:23 +0000 (GMT) [thread overview]
Message-ID: <alpine.LSU.1.00.0801202331380.5731@racer.site> (raw)
In-Reply-To: <alpine.LFD.1.00.0801201338140.2957@woody.linux-foundation.org>
Hi,
On Sun, 20 Jan 2008, Linus Torvalds wrote:
> In addition, we now have the infrastructure to generate *better* output,
> so if we want to make "git diff HEAD" generate a nice combined diff,
> this sets the stage for that.
Note: "git diff HEAD" as it is now still holds value; it tells you about
_all_ changes -- staged and unstaged -- and I have to admit that I used it
a lot (as "git diff HEAD -- file | git apply -R"; note the absence of
"--index" to the call to apply, otherwise "git checkout file" would have
done the same).
So if we ever do combined diffs for "git diff HEAD", I want an option to
turn them off, too.
Ciao,
Dscho
next prev parent reply other threads:[~2008-01-20 23:35 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-19 3:25 Updated in-memory index cleanup Linus Torvalds
2008-01-19 7:42 ` [PATCH] index: be careful when handling long names Junio C Hamano
2008-01-19 7:45 ` [PATCH] Avoid running lstat(2) on the same cache entry Junio C Hamano
2008-01-19 19:47 ` Linus Torvalds
2008-01-19 19:58 ` Linus Torvalds
2008-01-20 1:22 ` Linus Torvalds
2008-01-20 1:34 ` Linus Torvalds
2008-01-20 1:48 ` Johannes Schindelin
2008-01-20 2:02 ` Linus Torvalds
2008-01-20 10:33 ` Steffen Prohaska
2008-01-20 14:15 ` Johannes Schindelin
2008-01-21 0:18 ` Junio C Hamano
2008-01-20 15:10 ` Steffen Prohaska
2008-01-20 15:18 ` Johannes Schindelin
2008-01-20 15:19 ` [PATCH] Also use unpack_trees() in do_diff_cache() Johannes Schindelin
2008-01-20 20:32 ` Linus Torvalds
2008-01-20 21:53 ` Linus Torvalds
2008-01-20 23:34 ` Johannes Schindelin [this message]
2008-01-20 23:58 ` Linus Torvalds
2008-01-21 0:19 ` Johannes Schindelin
2008-01-20 15:21 ` [PATCH] Try to resurrect the handling for 'diff-index -m' Johannes Schindelin
2008-01-20 18:20 ` [PATCH] Avoid running lstat(2) on the same cache entry Linus Torvalds
2008-01-20 20:03 ` Brian Downing
2008-01-20 21:40 ` Steffen Prohaska
2008-01-20 22:09 ` Linus Torvalds
2008-01-20 2:42 ` 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
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=alpine.LSU.1.00.0801202331380.5731@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=prohaska@zib.de \
--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.
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).