Autogenerated man pages for v1.5.0-rc2-61-g1b60

diff --git a/man1/git-describe.1 b/man1/git-describe.1
index 8eb3704034c79286f369847466696f34b6205a69..330d9bd213169e75b9a929b73a0092255a4a1c8c 100644 (file)
--- a/man1/git-describe.1
+++ b/man1/git-describe.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\-DESCRIBE" "1" "01/15/2007" "" ""
+.TH "GIT\-DESCRIBE" "1" "01/28/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -12,7 +12,7 @@ git\-describe \- Show the most recent tag that is reachable from a commit
 .SH "SYNOPSIS"
 \fIgit\-describe\fR [\-\-all] [\-\-tags] [\-\-abbrev=<n>] <committish>\&...
 .SH "DESCRIPTION"
-The command finds the most recent tag that is reachable from a commit, and if the commit itself is pointed at by the tag, shows the tag. Otherwise, it suffixes the tag name with abbreviated object name of the commit.
+The command finds the most recent tag that is reachable from a commit, and if the commit itself is pointed at by the tag, shows the tag. Otherwise, it suffixes the tag name with the number of additional commits and the abbreviated object name of the commit.
 .SH "OPTIONS"
 .TP
 <committish>
@@ -37,9 +37,11 @@ With something like git.git current tree, I get:
 .sp
 .nf
 [torvalds@g5 git]$ git\-describe parent
-v1.0.4\-g2414721b
+v1.0.4\-14\-g2414721
 .fi
-i.e. the current head of my "parent" branch is based on v1.0.4, but since it has a few commits on top of that, it has added the git hash of the thing to the end: "\-g" + 8\-char shorthand for the commit 2414721b194453f058079d897d13c4e377f92dc6.
+i.e. the current head of my "parent" branch is based on v1.0.4, but since it has a handful commits on top of that, describe has added the number of additional commits ("14") and an abbreviated object name for the commit itself ("2414721") at the end.
+
+The number of additional commits is the number of commits which would be displayed by "git log v1.0.4..parent". The hash suffix is "\-g" + 7\-char abbreviation for the tip commit of parent (which was 2414721b194453f058079d897d13c4e377f92dc6).
 
 Doing a "git\-describe" on a tag\-name will just show the tag name:
 .sp
@@ -51,12 +53,18 @@ With \-\-all, the command can use branch heads as references, so the output show
 .sp
 .nf
 [torvalds@g5 git]$ git describe \-\-all \-\-abbrev=4 v1.0.5^2
-tags/v1.0.0\-g975b
+tags/v1.0.0\-21\-g975b
 .fi
 .sp
 .nf
 [torvalds@g5 git]$ git describe \-\-all HEAD^
-heads/lt/describe\-g975b
+heads/lt/describe\-7\-g975b
+.fi
+With \-\-abbrev set to 0, the command can be used to find the closest tagname without any suffix:
+.sp
+.nf
+[torvalds@g5 git]$ git describe \-\-abbrev=0 v1.0.5^2
+tags/v1.0.0
 .fi
 .SH "SEARCH STRATEGY"
 For each committish supplied "git describe" will first look for a tag which tags exactly that commit. Annotated tags will always be preferred over lightweight tags, and tags with newer dates will always be preferred over tags with older dates. If an exact match is found, its name will be output and searching will stop.
@@ -65,7 +73,7 @@ If an exact match was not found "git describe" will walk back through the commit
 
 If multiple tags were found during the walk then the tag which has the fewest commits different from the input committish will be selected and output. Here fewest commits different is defined as the number of commits which would be shown by "git log tag..input" will be the smallest number of commits possible.
 .SH "AUTHOR"
-Written by Linus Torvalds <torvalds@osdl.org>, but somewhat butchered by Junio C Hamano <junkio@cox.net>
+Written by Linus Torvalds <torvalds@osdl.org>, but somewhat butchered by Junio C Hamano <junkio@cox.net>. Later significantly updated by Shawn Pearce <spearce@spearce.org>.
 .SH "DOCUMENTATION"
 Documentation by David Greaves, Junio C Hamano and the git\-list <git@vger.kernel.org>.
 .SH "GIT"

diff --git a/man1/git-diff-files.1 b/man1/git-diff-files.1
index c09ba2ded75a9cfb2c6648502666b45723d2c236..51fbb587ff963e49f568a667cdc83c01fd708b90 100644 (file)
--- 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" "12/26/2006" "" ""
+.TH "GIT\-DIFF\-FILES" "1" "01/28/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -63,6 +63,9 @@ Show colored word diff, i.e. color words which have changed.
 \-\-no\-renames
 Turn off rename detection, even when the configuration file gives the default to do so.
 .TP
+\-\-check
+Warn if changes introduce trailing whitespace or an indent that uses a space before a tab.
+.TP
 \-\-full\-index
 Instead of the first handful characters, show full object name of pre\- and post\-image blob on the "index" line when generating a patch format output.
 .TP

diff --git a/man1/git-diff-index.1 b/man1/git-diff-index.1
index fcaa32d8765e199a2e79f0aff19e588e9b3aea5f..5ffb8e7312523e724f4c1f9d75251f316eca3151 100644 (file)
--- 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" "12/26/2006" "" ""
+.TH "GIT\-DIFF\-INDEX" "1" "01/28/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -63,6 +63,9 @@ Show colored word diff, i.e. color words which have changed.
 \-\-no\-renames
 Turn off rename detection, even when the configuration file gives the default to do so.
 .TP
+\-\-check
+Warn if changes introduce trailing whitespace or an indent that uses a space before a tab.
+.TP
 \-\-full\-index
 Instead of the first handful characters, show full object name of pre\- and post\-image blob on the "index" line when generating a patch format output.
 .TP

diff --git a/man1/git-diff-stages.1 b/man1/git-diff-stages.1
index 2998e3fb8a515f07db7694163b02d875d1be292c..8b4474fc03410350c670346a120f34d4a647a690 100644 (file)
--- 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" "01/19/2007" "" ""
+.TH "GIT\-DIFF\-STAGES" "1" "01/28/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -63,6 +63,9 @@ Show colored word diff, i.e. color words which have changed.
 \-\-no\-renames
 Turn off rename detection, even when the configuration file gives the default to do so.
 .TP
+\-\-check
+Warn if changes introduce trailing whitespace or an indent that uses a space before a tab.
+.TP
 \-\-full\-index
 Instead of the first handful characters, show full object name of pre\- and post\-image blob on the "index" line when generating a patch format output.
 .TP

diff --git a/man1/git-diff-tree.1 b/man1/git-diff-tree.1
index 5599d7be5a8dbaf7cf8de1fc14f81771e5f87ab3..16225beef3e21b1d94587423f850c7c9810d8f40 100644 (file)
--- 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" "12/31/2006" "" ""
+.TH "GIT\-DIFF\-TREE" "1" "01/28/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -72,6 +72,9 @@ Show colored word diff, i.e. color words which have changed.
 \-\-no\-renames
 Turn off rename detection, even when the configuration file gives the default to do so.
 .TP
+\-\-check
+Warn if changes introduce trailing whitespace or an indent that uses a space before a tab.
+.TP
 \-\-full\-index
 Instead of the first handful characters, show full object name of pre\- and post\-image blob on the "index" line when generating a patch format output.
 .TP

diff --git a/man1/git-diff.1 b/man1/git-diff.1
index a94bc178156dfcfa008b72106510305eee2a01dc..3412246a0da08edfbcbeffa3eb5d0e64f4ab7234 100644 (file)
--- a/man1/git-diff.1
+++ b/man1/git-diff.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" "1" "01/18/2007" "" ""
+.TH "GIT\-DIFF" "1" "01/28/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -79,6 +79,9 @@ Show colored word diff, i.e. color words which have changed.
 \-\-no\-renames
 Turn off rename detection, even when the configuration file gives the default to do so.
 .TP
+\-\-check
+Warn if changes introduce trailing whitespace or an indent that uses a space before a tab.
+.TP
 \-\-full\-index
 Instead of the first handful characters, show full object name of pre\- and post\-image blob on the "index" line when generating a patch format output.
 .TP

diff --git a/man1/git-repo-config.1 b/man1/git-repo-config.1
index 4d78ab4d6341eb89e92ee6297285712a1edea9da..a1018019f3567de0f316ea005258e854e7bc6e80 100644 (file)
--- a/man1/git-repo-config.1
+++ b/man1/git-repo-config.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\-REPO\-CONFIG" "1" "01/25/2007" "" ""
+.TH "GIT\-REPO\-CONFIG" "1" "01/28/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -439,6 +439,9 @@ Your email address to be recorded in any newly created commits. Can be overridde
 user.name
 Your full name to be recorded in any newly created commits. Can be overridden by the \fIGIT_AUTHOR_NAME\fR and \fIGIT_COMMITTER_NAME\fR environment variables. See \fBgit\-commit\-tree\fR(1).
 .TP
+user.signingkey
+If \fBgit\-tag\fR(1) is not selecting the key you want it to automatically when creating a signed tag, you can override the default selection with this variable. This option is passed unchanged to gpg's \-\-local\-user parameter, so you may specify a key using any method that gpg supports.
+.TP
 whatchanged.difftree
 The default \fBgit\-diff\-tree\fR(1) arguments to be used for \fBgit\-whatchanged\fR(1).
 .TP

diff --git a/man1/git-tag.1 b/man1/git-tag.1
index 6bdcff88984d41f57c6b0fd29c2d1934ea29a966..416acd0bee10e61c8e6fc6e35db7228cb24a38f4 100644 (file)
--- a/man1/git-tag.1
+++ b/man1/git-tag.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\-TAG" "1" "01/21/2007" "" ""
+.TH "GIT\-TAG" "1" "01/28/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -60,6 +60,12 @@ Use the given tag message (instead of prompting)
 .TP
 \-F <file>
 Take the tag message from the given file. Use \fI\-\fR to read the message from the standard input.
+.SH "CONFIGURATION"
+By default, git\-tag in sign\-with\-default mode (\-s) will use your committer identity (of the form "Your Name <your@email.address>") to find a key. If you want to use a different default key, you can specify it in the repository configuration as follows:
+.sp
+.nf
+signingkey = <gpg\-key\-id>
+.fi
 .SH "AUTHOR"
 Written by Linus Torvalds <torvalds@osdl.org>, Junio C Hamano <junkio@cox.net> and Chris Wright <chrisw@osdl.org>.
 .SH "DOCUMENTATION"

diff --git a/man7/git.7 b/man7/git.7
index a54daab463668b55fd772c15c7e26f8cdc3b2d84..c2d8c99eadd6411308cc39492d7be0ae3177cb43 100644 (file)
--- a/man7/git.7
+++ b/man7/git.7
@@ -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" "7" "01/26/2007" "" ""
+.TH "GIT" "7" "01/28/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)