From: Johannes Schindelin Date: Sun, 20 Jan 2008 23:34:23 GMT Subject: Re: [PATCH] Also use unpack_trees() in do_diff_cache() Message-ID: In-Reply-To: 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