From: Jakub Narebski Date: Sat, 02 Dec 2006 08:57:22 GMT Subject: Re: git and bzr Message-ID: In-Reply-To: <456FFC10.7060703@op5.se> Andreas Ericsson wrote: > ---%<---%<---%<--- > SYNOPSIS > -------- > 'git-diff' [ --diff-options ] {0,2} [...] > > DESCRIPTION > ----------- > Show changes between two trees, a tree and the working tree, a > tree and the index file, or the index file and the working tree. > The combination of what is compared with what is determined by > the number of trees given to the command. > > * When no is given, the working tree and the index > file are compared, using `git-diff-files`. > > * When one is given, the working tree and the named > tree are compared, using `git-diff-index`. The option > `--index` can be given to compare the index file and > the named tree. > `--cached` is a deprecated alias for `--index`. It's use is > discouraged. > > * When two s are given, these two trees are compared > using `git-diff-tree`. > ---%<---%<---%<--- > > This needs an update, I think. I'll look into it on sunday if no-one's > beaten me to it. You might want to use Junio proposal in Message-ID: <7vhcwgcf39.fsf@assigned-by-dhcp.cox.net> http://permalink.gmane.org/gmane.comp.version-control.git/32853 (and perhaps also my reply to it) -- Jakub Narebski Warsaw, Poland ShadeHawk on #git