Re: git and bzr
- From
Andreas Ericsson <ae@op5.se>
- Date
- Dec 1, 2006, 09:55 UTC
- Message-ID
- <456FFC10.7060703@op5.se>
- In-Reply-To
- <ekndmb$7e9$1@sea.gmane.org>
Jakub Narebski wrote:
Show 9 quoted lines
> Theodore Tso wrote: > >> * When no <ent> is given, the working tree and the index file >> is compared, using git-diff-files. > > * When no <tree-ish> is given, the working tree and the index file are > compared, using git-diff-files. > > Use more modern git.
More modern git (pull'ed 10 minutes ago) has this, at least when cut from Documentation/git-diff.txt: ---%<---%<---%<--- SYNOPSIS -------- 'git-diff' [ --diff-options ] <tree-ish>{0,2} [<path>...]
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 <tree-ish> is given, the working tree and the index file are compared, using `git-diff-files`.
* When one <tree-ish> 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 <tree-ish>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.
-- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se