Autogenerated manpages for v1.5.3-rc1-4-gaf83

diff --git a/man1/git-clone.1 b/man1/git-clone.1
index 9f7cbd100fe843b5a9cfed3b12a0d7ebde99c600..259e20b4d1b8c29de3ab9ecb8241759a1171554e 100644 (file)
--- a/man1/git-clone.1
+++ b/man1/git-clone.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\-CLONE" "1" "07/06/2007" "Git 1.5.3.rc0.39.g46f7" "Git Manual"
+.TH "GIT\-CLONE" "1" "07/13/2007" "Git 1.5.3.rc1.4.gaf83" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -36,7 +36,7 @@ If the reference repository is on the local machine automatically setup .git/obj
 \-\-quiet , \-q
 Operate quietly. This flag is passed to "rsync" and "git\-fetch\-pack" commands when given.
 .TP
-\-n
+\-\-no\-checkout , \-n
 No checkout of HEAD is performed after the clone is complete.
 .TP
 \-\-bare

diff --git a/man1/git-commit.1 b/man1/git-commit.1
index e8a345581f3f8de9bdbc552a7d8af62abaeb451b..150dcde6bc8e9e258750e49cad8a0252200b6c8f 100644 (file)
--- a/man1/git-commit.1
+++ b/man1/git-commit.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\-COMMIT" "1" "06/16/2007" "" ""
+.TH "GIT\-COMMIT" "1" "07/13/2007" "Git 1.5.3.rc1.4.gaf83" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -12,7 +12,7 @@ git\-commit \- Record changes to the repository
 .SH "SYNOPSIS"
 .sp
 .nf
-\fIgit\-commit\fR [\-a | \-\-interactive] [\-s] [\-v]
+\fIgit\-commit\fR [\-a | \-\-interactive] [\-s] [\-v] [\-u]
            [(\-c | \-C) <commit> | \-F <file> | \-m <msg> | \-\-amend]
            [\-\-no\-verify] [\-e] [\-\-author <author>]
            [\-\-] [[\-i | \-o ]<file>\&...]
@@ -52,7 +52,7 @@ Take the commit message from the given file. Use \fI\-\fR to read the message fr
 \-\-author <author>
 Override the author name used in the commit. Use A U Thor <author@example.com> format.
 .TP
-\-m <msg>
+\-m <msg>|\-\-message=<msg>
 Use the given <msg> as the commit message.
 .TP
 \-s|\-\-signoff
@@ -79,6 +79,12 @@ but can be used to amend a merge commit.
 \-i|\-\-include
 Before making a commit out of staged contents so far, stage the contents of paths given on the command line as well. This is usually not what you want unless you are concluding a conflicted merge.
 .TP
+\-u|\-\-untracked\-files
+Show all untracked files, also those in uninteresting directories, in the "Untracked files:" section of commit message template. Without this option only its name and a trailing slash are displayed for each untracked directory.
+.TP
+\-v|\-\-verbose
+Show unified diff between the HEAD commit and what would be committed at the bottom of the commit message template. Note that this diff output doesn't have its lines prefixed with \fI#\fR.
+.TP
 \-q|\-\-quiet
 Suppress commit summary message.
 .TP

diff --git a/man1/git-config.1 b/man1/git-config.1
index 5b4cb599bb6de402ddd8748c08e69961501021f6..5ac03a909c713aaed3c9baaf4f3f99b03f193745 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" "07/13/2007" "Git 1.5.3.rc1" "Git Manual"
+.TH "GIT\-CONFIG" "1" "07/13/2007" "Git 1.5.3.rc1.4.gaf83" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -518,7 +518,7 @@ merge.tool
 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.
+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. Can be overriden by \fIGIT_MERGE_VERBOSITY\fR environment variable.
 .TP
 merge.<driver>.name
 Defines a human readable name for a custom low\-level merge driver. See \fBgitattributes\fR(5) for details.

diff --git a/man1/git-merge.1 b/man1/git-merge.1
index 0e762b7b6699980a329c04c1b320cb8a6b9652b9..3ea2490a31c7347c4df15c47a9a74acc641c1853 100644 (file)
--- a/man1/git-merge.1
+++ b/man1/git-merge.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\-MERGE" "1" "06/16/2007" "Git 1.5.2.1.144.gabc40" "Git Manual"
+.TH "GIT\-MERGE" "1" "07/13/2007" "Git 1.5.3.rc1.4.gaf83" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -57,6 +57,13 @@ ours
 This resolves any number of heads, but the result of the merge is always the current branch head. It is meant to be used to supersede old development history of side branches.
 
 If you tried a merge which resulted in a complex conflicts and would want to start over, you can recover with \fBgit\-reset\fR(1).
+.SH "CONFIGURATION"
+.TP
+merge.summary
+Whether to include summaries of merged commits in newly created merge commit. False by default.
+.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. Can be overriden by \fIGIT_MERGE_VERBOSITY\fR environment variable.
 .SH "HOW MERGE WORKS"
 A merge is always between the current HEAD and one or more remote branch heads, and the index file must exactly match the tree of HEAD commit (i.e. the contents of the last commit) when it happens. In other words, git\-diff \-\-cached HEAD must report no changes.
 .sp

diff --git a/man7/git.7 b/man7/git.7
index 9b5409113131e2c19a1f0c1b786e851ab3502bb5..4cef88cfa940cee5cd8aff3dfb37d2589b3350eb 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" "07/13/2007" "Git 1.5.3.rc1" "Git Manual"
+.TH "GIT" "7" "07/13/2007" "Git 1.5.3.rc1.4.gaf83" "Git Manual"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -595,6 +595,9 @@ The file parameters can point at the user's working file (e.g. new\-file in "git
 For a path that is unmerged, \fIGIT_EXTERNAL_DIFF\fR is called with 1 parameter, <path>.
 .SS "other"
 .TP
+\fIGIT_MERGE_VERBOSITY\fR
+A number controlling the amount of output shown by the recursive merge strategy. Overrides merge.verbosity. See \fBgit\-merge\fR(1)
+.TP
 \fIGIT_PAGER\fR
 This environment variable overrides $PAGER.
 .TP