Re: git patch

[Johannes Schindelin]

Hi,

On Wed, 6 Dec 2006, Han-Wen Nienhuys wrote:

> Johannes Schindelin escreveu:
> > The nice thing for me about Git: you never lose anything. Unless you say 
> > "git prune" (in which case you really should know what you are doing), you 
> > do not lose (committed) data.
> > 
> > Now, I promised to tell you what to do if all the files seem modified. Did 
> > you look through "git -p diff"? (BTW with recent Git you only need "git 
> > diff" and it will pipe the result into your pager automatically.)
> 
> This actually bothers me as well from a UI point of view.  Git-diff is
> used both for generating diffs between versions that come from git and
> the working tree/index.

The thing is: it is so darned convenient. In 99% of calling "git diff" you 
do not have a modified staging area. It is still fresh, and all your 
changes are in the working directory only.

Then you can say

$ git diff

to see what you have changed. (Since Git 1.4.3 it automatically sends the 
output to a pager if the target is a tty, so you do not need the "-p" 
flag).

But you also can compare it to _any_ revision. That includes a tag:

$ git diff lilypond_2_9_7

and you see all the changes with respect to that revision, fast. It may 
seem fishy at first sight, but at second, it is really convenient, so I 
don't complain any more...

Ciao,
Dscho