From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Wed, 06 Dec 2006 09:55:09 GMT
Subject: Re: git patch
Message-ID: <4576937D.1070402@xs4all.nl>
In-Reply-To: <Pine.LNX.4.63.0612060157020.28348@wbgn013.biozentrum.uni-wuerzburg.de>

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.

I think it would be more logical to show those diffs as part of
git-status and perhaps git-commit, eg.

  git-commit --dry-run <commitoptions>

shows the diff of what would be committed

  git-status --diff

shows diffs of modified files in the working tree.

This makes it more clear what each diff means.

-- 
 Han-Wen Nienhuys - hanwen@xs4all.nl - http://www.xs4all.nl/~hanwen