* [PATCH] Document that diff/diff-tree accept any number of trees.
@ 2006-05-20 20:51 Santi
0 siblings, 0 replies; only message in thread
From: Santi @ 2006-05-20 20:51 UTC (permalink / raw
To: git, Junio C Hamano
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
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
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2006-05-20 20:51 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-20 20:51 [PATCH] Document that diff/diff-tree accept any number of trees Santi
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).