From: Santi <sbejar@gmail.com>
To: git@vger.kernel.org, "Junio C Hamano" <junkio@cox.net>
Subject: [PATCH] Document that diff/diff-tree accept any number of trees.
Date: Sat, 20 May 2006 22:51:03 +0200 [thread overview]
Message-ID: <8aa486160605201351y4734993dg@mail.gmail.com> (raw)
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
reply other threads:[~2006-05-20 20:51 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8aa486160605201351y4734993dg@mail.gmail.com \
--to=sbejar@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).