threads / patch / 4221

patchDocument that diff/diff-tree accept any number of trees.

Subject: [PATCH] Document that diff/diff-tree accept any number of trees.

## tl;dr

One message between May 20, 2006 and May 20, 2006. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Santi· May 20, 2006, 20:51 UTC · lore
Signed-off-by: Santi Béjar <sbejar@gmail.com>
---
b98780e10df65bf9b37b4368d97bac53b5371170
 Documentation/git-diff-tree.txt |    5 ++++-
 Documentation/git-diff.txt      |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)
b98780e10df65bf9b37b4368d97bac53b5371170
Show changes to 2 files +6 −4

Documentation/git-diff-tree.txt, Documentation/git-diff.txt

diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 906830d..3141ad8 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 [verse]
 'git-diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
              [-t] [-r] [-c | --cc] [--root] [<common diff options>]
-             <tree-ish> [<tree-ish>] [<path>...]
+             <tree-ish>... [<path>...]

 DESCRIPTION
 -----------
@@ -20,6 +20,9 @@ Compares the content and mode of the blo
 If there is only one <tree-ish> given, the commit is compared with its parents
 (see --stdin below).

+If three or more <tree-ish> are given, it shows the differences from each of
+the <tree-ish> to the first one simultaneously (see -c below).
+
 Note that "git-diff-tree" can use the tree encapsulated in a commit object.

 OPTIONS
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 7267bcd..1842d7a 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -8,7 +8,7 @@ git-diff - Show changes between commits,

 SYNOPSIS
 --------
-'git-diff' [ --diff-options ] <ent>{0,2} [<path>...]
+'git-diff' [ --diff-options ] [<ent>...] [<path>...]

 DESCRIPTION
 -----------
@@ -25,7 +25,7 @@ the number of ents given to the command.
   `--cached` can be given to compare the index file and
   the named tree.

-* When two <ent>s are given, these two trees are compared
+* When two or more <ent>s are given, these trees are compared
   using `git-diff-tree`.

 OPTIONS
--
1.3.3.g5b1bb

← back to recent threads