Autogenerated manpages for v1.5.2.1-174-gcd03

diff --git a/man1/git-config.1 b/man1/git-config.1
index 5be19d749bd666d76a335afd44fe5b75fba903bb..bbf4ad64595e9937b0c9e90db081ff591d43268a 100644 (file)
--- a/man1/git-config.1
+++ b/man1/git-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\-CONFIG" "1" "06/08/2007" "Git 1.5.2.1.144.gabc40" "Git Manual"
+.TH "GIT\-CONFIG" "1" "06/11/2007" "Git 1.5.2.1.174.gcd03" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -499,7 +499,7 @@ merge.summary
 Whether to include summaries of merged commits in newly created merge commit messages. False by default.
 .TP
 merge.tool
-Controls which merge resolution program is used by \fBgit\-mergetool\fR(l). Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", and "opendiff"
+Controls which merge resolution program is used by \fBgit\-mergetool\fR(l). Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff", and "opendiff".
 .TP
 merge.verbosity
 Controls the amount of output shown by the recursive merge strategy. Level 0 outputs nothing except a final error message if conflicts were detected. Level 1 outputs only conflicts, 2 outputs conflicts and file changes. Level 5 and above outputs debugging information. The default is level 2.

diff --git a/man1/git-mergetool.1 b/man1/git-mergetool.1
index 1b82b581e93d8075a6a010528ba24b8f23069e53..d7f9fdf20c6fd9343e13b95b2837527a4e53db1f 100644 (file)
--- a/man1/git-mergetool.1
+++ b/man1/git-mergetool.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\-MERGETOOL" "1" "06/08/2007" "Git 1.5.2.1.144.gabc40" "Git Manual"
+.TH "GIT\-MERGETOOL" "1" "06/11/2007" "Git 1.5.2.1.174.gcd03" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -18,7 +18,7 @@ If one or more <file> parameters are given, the merge tool program will be run t
 .SH "OPTIONS"
 .TP
 \-t or \-\-tool=<tool>
-Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, and opendiff
+Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, and opendiff
 
 If a merge resolution program is not specified, \fIgit mergetool\fR will use the configuration variable merge.tool. If the configuration variable merge.tool is not set, \fIgit mergetool\fR will pick a suitable default.
 .SH "AUTHOR"

diff --git a/man1/git-mktag.1 b/man1/git-mktag.1
index 28010a1e8cb606c34d5e3ed96cbc57ea9b3f00c5..34c69e047af32d3b7f31906c9923dcaa447022bc 100644 (file)
--- a/man1/git-mktag.1
+++ b/man1/git-mktag.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\-MKTAG" "1" "06/08/2007" "Git 1.5.2.1.144.gabc40" "Git Manual"
+.TH "GIT\-MKTAG" "1" "06/11/2007" "Git 1.5.2.1.174.gcd03" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -16,16 +16,15 @@ Reads a tag contents on standard input and creates a tag object that can also be
 
 The output is the new tag's <object> identifier.
 .SH "TAG FORMAT"
-A tag signature file has a very simple fixed format: three lines of
+A tag signature file has a very simple fixed format: four lines of
 .sp
 .nf
 object <sha1>
 type <typename>
 tag <tagname>
+tagger <tagger>
 .fi
-followed by some \fIoptional\fR free\-form signature that git itself doesn't care about, but that can be verified with gpg or similar.
-
-The size of the full object is artificially limited to 8kB. (Just because I'm a lazy bastard, and if you can't fit a signature in that size, you're doing something wrong)
+followed by some \fIoptional\fR free\-form message (some tags created by older git may not have tagger line). The message, when exists, is separated by a blank line from the header. The message part may contain a signature that git itself doesn't care about, but that can be verified with gpg.
 .SH "AUTHOR"
 Written by Linus Torvalds <torvalds@osdl.org>
 .SH "DOCUMENTATION"