From c435b1c424b0ffb554c70bae7da733e4eadda20a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 28 Aug 2007 06:25:35 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3-rc6-54-g9277 --- git-diff.html | 70 ++++++++++++++++++++++++++++++++++++++++++++------- git-diff.txt | 43 +++++++++++++++++++++++++------ git-tag.html | 6 +---- git-tag.txt | 7 ------ git.html | 6 +++-- git.txt | 5 +++- 6 files changed, 106 insertions(+), 31 deletions(-) diff --git a/git-diff.html b/git-diff.html index addaa38e3..5bf957608 100644 --- a/git-diff.html +++ b/git-diff.html @@ -290,12 +290,9 @@ tree and the index file, or the index file and the working tree.

further add to the index but you still haven't. You can stage these changes by using git-add(1).

-
-
-
If exactly two paths are given, and at least one is untracked,
+
If exactly two paths are given, and at least one is untracked,
 compare the two files / directories. This behavior can be
-forced by --no-index.
-
+forced by --no-index.

git-diff [--options] --cached [<commit>] [--] [<path>…] @@ -325,8 +322,30 @@ forced by --no-index.

- This form is to view the changes between two <commit>, - for example, tips of two branches. + This is to view the changes between two arbitrary + <commit>. +

+
+
+git-diff [--options] <commit>..<commit> [--] [<path>…] +
+
+

+ This is synonymous to the previous form. If <commit> on + one side is omitted, it will have the same effect as + using HEAD instead. +

+
+
+git-diff [--options] <commit>…<commit> [--] [<path>…] +
+
+

+ This form is to view the changes on the branch containing + and up to the second <commit>, starting at a common ancestor + of both <commit>. "git-diff A…B" is equivalent to + "git-diff $(git-merge-base A B) B". You can omit any one + of <commit>, which has the same effect as using HEAD instead.

@@ -334,7 +353,11 @@ forced by --no-index. noted that all of the <commit> in the above description can be any <tree-ish>.

For a more complete list of ways to spell <commit>, see -"SPECIFYING REVISIONS" section in git-rev-parse(1).

+"SPECIFYING REVISIONS" section in git-rev-parse(1). +However, "diff" is about comparing two _endpoints_, not ranges, +and the range notations ("<commit>..<commit>" and +"<commit>…<commit>") do not mean a range as defined in the +"SPECIFYING RANGES" section in git-rev-parse(1).

OPTIONS

@@ -827,6 +850,35 @@ Compare the version before the last commit and the last commit.
+Comparing branches +
+
+
+
+
$ git diff topic master    (1)
+$ git diff topic..master   (2)
+$ git diff topic...master  (3)
+
+
    +
  1. +

    +Changes between the tips of the topic and the master branches. +

    +
    2. +
  2. +

    +Same as above. +

    +
    3. +
  3. +

    +Changes that occured on the master branch since when the topic +branch was started off it. +

    +
    4. +
+
+
Limiting the diff output
@@ -895,7 +947,7 @@ Output diff in reverse.
diff --git a/git-diff.txt b/git-diff.txt index b36e705dd..68e65324f 100644 --- a/git-diff.txt +++ b/git-diff.txt @@ -22,10 +22,10 @@ tree and the index file, or the index file and the working tree. words, the differences are what you _could_ tell git to further add to the index but you still haven't. You can stage these changes by using gitlink:git-add[1]. - - If exactly two paths are given, and at least one is untracked, - compare the two files / directories. This behavior can be - forced by --no-index. ++ +If exactly two paths are given, and at least one is untracked, +compare the two files / directories. This behavior can be +forced by --no-index. 'git-diff' [--options] --cached [] [--] [...]:: @@ -44,8 +44,22 @@ tree and the index file, or the index file and the working tree. 'git-diff' [--options] [--] [...]:: - This form is to view the changes between two , - for example, tips of two branches. + This is to view the changes between two arbitrary + . + +'git-diff' [--options] .. [--] [...]:: + + This is synonymous to the previous form. If on + one side is omitted, it will have the same effect as + using HEAD instead. + +'git-diff' [--options] ... [--] [...]:: + + This form is to view the changes on the branch containing + and up to the second , starting at a common ancestor + of both . "git-diff A...B" is equivalent to + "git-diff $(git-merge-base A B) B". You can omit any one + of , which has the same effect as using HEAD instead. Just in case if you are doing something exotic, it should be noted that all of the in the above description can be @@ -53,7 +67,10 @@ any . For a more complete list of ways to spell , see "SPECIFYING REVISIONS" section in gitlink:git-rev-parse[1]. - +However, "diff" is about comparing two _endpoints_, not ranges, +and the range notations (".." and +"...") do not mean a range as defined in the +"SPECIFYING RANGES" section in gitlink:git-rev-parse[1]. OPTIONS ------- @@ -97,6 +114,18 @@ the tip of the current branch, but limit the comparison to the file "test". <3> Compare the version before the last commit and the last commit. +Comparing branches:: ++ +------------ +$ git diff topic master <1> +$ git diff topic..master <2> +$ git diff topic...master <3> +------------ ++ +<1> Changes between the tips of the topic and the master branches. +<2> Same as above. +<3> Changes that occured on the master branch since when the topic +branch was started off it. Limiting the diff output:: + diff --git a/git-tag.html b/git-tag.html index 4a468dbe7..821945167 100644 --- a/git-tag.html +++ b/git-tag.html @@ -293,10 +293,6 @@ written (i.e. a lightweight tag).

<key-id> is used. When -u <key-id> is not used, the committer identity for the current user is used to find the GnuPG key for signing.

-

-d <tag> deletes the tag.

-

-v <tag> verifies the gpg signature of the tag.

-

-l <pattern> lists tags with names that match the given pattern -(or all if no pattern is given).

OPTIONS

@@ -533,7 +529,7 @@ Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.<
diff --git a/git-tag.txt b/git-tag.txt index 119117f0b..990ae4f94 100644 --- a/git-tag.txt +++ b/git-tag.txt @@ -34,13 +34,6 @@ A GnuPG signed tag object will be created when `-s` or `-u committer identity for the current user is used to find the GnuPG key for signing. -`-d ` deletes the tag. - -`-v ` verifies the gpg signature of the tag. - -`-l ` lists tags with names that match the given pattern -(or all if no pattern is given). - OPTIONS ------- -a:: diff --git a/git.html b/git.html index ee4f45d2b..034de06ff 100644 --- a/git.html +++ b/git.html @@ -371,7 +371,9 @@ documentation can be viewed at

- Same as --git-dir=pwd. + Treat the repository as a bare repository. If GIT_DIR + environment is not set, it is set to the current working + directory.

@@ -2438,7 +2440,7 @@ contributors on the git-list <git@vger.kernel.org>.

diff --git a/git.txt b/git.txt index 3b0d53025..75b3e1b87 100644 --- a/git.txt +++ b/git.txt @@ -120,7 +120,10 @@ OPTIONS variable. --bare:: - Same as --git-dir=`pwd`. + Treat the repository as a bare repository. If GIT_DIR + environment is not set, it is set to the current working + directory. + FURTHER DOCUMENTATION --------------------- -- 2.26.2