Re: git and bzr

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jakub Narebski wrote:
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@xxxxxx
OP5 AB                             www.op5.se
Tel: +46 8-230225                  Fax: +46 8-230231
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]