Autogenerated man pages for v1.4.3-g72bb

diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1
index dc530590eedf379e844c390719ce8e3c5b6f531c..4db2713bf409cb2482f7f0d999604ae8f42f9661 100755 (executable)
--- a/man1/git-diff-files.1
+++ b/man1/git-diff-files.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DIFF\-FILES" "1" "10/03/2006" "" ""
+.TH "GIT\-DIFF\-FILES" "1" "10/19/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -32,6 +32,9 @@ Synonym for "\-p \-\-raw".
 \-\-stat[=width[,name\-width]]
 Generate a diffstat. You can override the default output width for 80\-column terminal by "\-\-stat=width". The width of the filename part can be controlled by giving another width to it separated by a comma.
 .TP
+\-\-numstat
+Similar to \-\-stat, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly.
+.TP
 \-\-summary
 Output a condensed summary of extended header information such as creations, renames and mode changes.
 .TP

diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1
index 4b67d71df68229e80f0aa349cca1dd4b88174357..6328e3b28cc53d31387a85fe4b9c757274c4c955 100755 (executable)
--- a/man1/git-diff-index.1
+++ b/man1/git-diff-index.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DIFF\-INDEX" "1" "10/03/2006" "" ""
+.TH "GIT\-DIFF\-INDEX" "1" "10/19/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -32,6 +32,9 @@ Synonym for "\-p \-\-raw".
 \-\-stat[=width[,name\-width]]
 Generate a diffstat. You can override the default output width for 80\-column terminal by "\-\-stat=width". The width of the filename part can be controlled by giving another width to it separated by a comma.
 .TP
+\-\-numstat
+Similar to \-\-stat, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly.
+.TP
 \-\-summary
 Output a condensed summary of extended header information such as creations, renames and mode changes.
 .TP

diff --git a/man1/git-diff-stages.1 b/man1/git-diff-stages.1
index b72ed0c00113a973de7ca866c5b197f0e2441f33..b32bcdcbe8056b077e4615302267c57bbd4b5a0e 100755 (executable)
--- a/man1/git-diff-stages.1
+++ b/man1/git-diff-stages.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DIFF\-STAGES" "1" "10/03/2006" "" ""
+.TH "GIT\-DIFF\-STAGES" "1" "10/19/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -32,6 +32,9 @@ Synonym for "\-p \-\-raw".
 \-\-stat[=width[,name\-width]]
 Generate a diffstat. You can override the default output width for 80\-column terminal by "\-\-stat=width". The width of the filename part can be controlled by giving another width to it separated by a comma.
 .TP
+\-\-numstat
+Similar to \-\-stat, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly.
+.TP
 \-\-summary
 Output a condensed summary of extended header information such as creations, renames and mode changes.
 .TP

diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index d208cfd5d3941dbc6943b6eb99a242a8d37e070f..764c36b5719b6ec9cd443801b2538e74f0ae0352 100755 (executable)
--- a/man1/git-diff-tree.1
+++ b/man1/git-diff-tree.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-DIFF\-TREE" "1" "10/03/2006" "" ""
+.TH "GIT\-DIFF\-TREE" "1" "10/19/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -40,6 +40,9 @@ Synonym for "\-p \-\-raw".
 \-\-stat[=width[,name\-width]]
 Generate a diffstat. You can override the default output width for 80\-column terminal by "\-\-stat=width". The width of the filename part can be controlled by giving another width to it separated by a comma.
 .TP
+\-\-numstat
+Similar to \-\-stat, but shows number of added and deleted lines in decimal notation and pathname without abbreviation, to make it more machine friendly.
+.TP
 \-\-summary
 Output a condensed summary of extended header information such as creations, renames and mode changes.
 .TP

diff --git a/man1/git-grep.1 b/man1/git-grep.1
index 64a61eacb4230ecf492e2f511a87d371b6650a53..587f9a0aabb618e65623c350523dce053c5bd5aa 100755 (executable)
--- a/man1/git-grep.1
+++ b/man1/git-grep.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-GREP" "1" "10/03/2006" "" ""
+.TH "GIT\-GREP" "1" "10/19/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -17,7 +17,7 @@ git\-grep \- Print lines matching a pattern
            [\-v | \-\-invert\-match] [\-h|\-H] [\-\-full\-name]
            [\-E | \-\-extended\-regexp] [\-G | \-\-basic\-regexp] [\-F | \-\-fixed\-strings]
            [\-n] [\-l | \-\-files\-with\-matches] [\-L | \-\-files\-without\-match]
-           [\-c | \-\-count]
+           [\-c | \-\-count] [\-\-all\-match]
            [\-A <post\-context>] [\-B <pre\-context>] [\-C <context>]
            [\-f <file>] [\-e] <pattern> [\-\-and|\-\-or|\-\-not|(|)|\-e <pattern>\&...]
            [<tree>\&...]
@@ -94,6 +94,10 @@ has higher precedence than
 \-e
 has to be used for all patterns.
 .TP
+\-\-all\-match
+When giving multiple pattern expressions combined with
+\-\-or, this flag is specified to limit the match to files that have lines to match all of them.
+.TP
 <tree>\&...
 Search blobs in the trees for specified patterns.
 .TP
@@ -108,6 +112,13 @@ and either
 MAX_PATH
 or
 PATH_MAX.
+.TP
+git grep \-\-all\-match \-e NODE \-e Unexpected
+Looks for a line that has
+NODE
+or
+Unexpected
+in files that have lines that match both.
 .SH "AUTHOR"
 Originally written by Linus Torvalds <torvalds@osdl.org>, later revamped by Junio C Hamano.
 .sp

diff --git a/man1/git-rebase.1 b/man1/git-rebase.1
index a8e5a94371e3c5430e0c59d0ba17b82be1473ecc..6f61dc4c526ca5b9eb9aa3304454678429023859 100755 (executable)
--- a/man1/git-rebase.1
+++ b/man1/git-rebase.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REBASE" "1" "10/03/2006" "" ""
+.TH "GIT\-REBASE" "1" "10/19/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -10,7 +10,7 @@
 .SH "NAME"
 git\-rebase \- Rebase local commits to a new head
 .SH "SYNOPSIS"
-\fIgit\-rebase\fR [\-\-merge] [\-\-onto <newbase>] <upstream> [<branch>]
+\fIgit\-rebase\fR [\-v] [\-\-merge] [\-\-onto <newbase>] <upstream> [<branch>]
 .sp
 \fIgit\-rebase\fR \-\-continue | \-\-skip | \-\-abort
 .sp
@@ -107,6 +107,9 @@ option, a built\-in list of strategies is used instead (git\-merge\-recursive
 when merging a single head,
 git\-merge\-octopus
 otherwise). This implies \-\-merge.
+.TP
+\-v, \-\-verbose
+Display a diffstat of what changed upstream since the last rebase.
 .SH "MERGE STRATEGIES"
 .TP
 resolve

diff --git a/man1/git-rev-parse.1 b/man1/git-rev-parse.1
index 9b510c706dd21491e0e22c6574491972d68d53ba..17af8ed6b49591197da10408c1e930bfb3131055 100755 (executable)
--- a/man1/git-rev-parse.1
+++ b/man1/git-rev-parse.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "GIT\-REV\-PARSE" "1" "10/03/2006" "" ""
+.TH "GIT\-REV\-PARSE" "1" "10/19/2006" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -98,13 +98,18 @@ Parses the date string, and outputs corresponding \-\-min\-age= parameter for gi
 <args>\&...
 Flags and parameters to be parsed.
 .SH "SPECIFYING REVISIONS"
-A revision parameter typically, but not necessarily, names a commit object. They use what is called an \fIextended SHA1\fR syntax.
+A revision parameter typically, but not necessarily, names a commit object. They use what is called an \fIextended SHA1\fR syntax. Here are various ways to spell object names. The ones listed near the end of this list are to name trees and blobs contained in a commit.
 .sp
 .TP 3
 \(bu
 The full SHA1 object name (40\-byte hexadecimal string), or a substring of such that is unique within the repository. E.g. dae86e1950b1277e545cee180551750029cfe735 and dae86e both name the same commit object if there are no other object in your repository whose object name starts with dae86e.
 .TP
 \(bu
+An output from
+git\-describe; i.e. a closest tag, followed by a dash, a
+\fIg\fR, and an abbreviated object name.
+.TP
+\(bu
 A symbolic ref name. E.g.
 \fImaster\fR
 typically means the commit object referenced by $GIT_DIR/refs/heads/master. If you happen to have both heads/master and tags/master, you can explicitly say
@@ -153,6 +158,14 @@ A suffix
 \fI^\fR
 followed by an empty brace pair (e.g.
 v0.99.8^{}) means the object could be a tag, and dereference the tag recursively until a non\-tag object is found.
+.TP
+\(bu
+A suffix
+\fI:\fR
+followed by a path; this names the blob or tree at the given path in the tree\-ish object named by the part before the colon.
+.TP
+\(bu
+A colon, optionally followed by a stage number (0 to 3) and a colon, followed by a path; this names a blob object in the index at the given path. Missing stage number (and the colon that follows it) names an stage 0 entry.
 Here is an illustration, by Jon Loeliger. Both node B and C are a commit parents of commit node A. Parent commits are ordered left\-to\-right.
 .sp
 .sp