Autogenerated man pages for v1.5.1-rc1

diff --git a/man1/git-config.1 b/man1/git-config.1
index 7c3943fbd289a10427cd7ecf3ae730db20332644..9fa7508e9eda28fe11834a2754acff2095f9c321 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" "03/16/2007" "" ""
+.TH "GIT\-CONFIG" "1" "03/19/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -311,6 +311,13 @@ Maximum number of bytes to map simultaneously into memory from pack files. If Gi
 
 Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms. This should be reasonable for all users/operating systems, except on the largest projects. You probably do not need to adjust this value.
 
+Common unit suffixes of \fIk\fR, \fIm\fR, or \fIg\fR are supported.
+.TP
+core.deltaBaseCacheLimit
+Maximum number of bytes to reserve for caching base objects that multiple deltafied objects reference. By storing the entire decompressed base objects in a cache Git is able to avoid unpacking and decompressing frequently used base objects multiple times.
+
+Default is 16 MiB on all platforms. This should be reasonable for all users/operating systems, except on the largest projects. You probably do not need to adjust this value.
+
 Common unit suffixes of \fIk\fR, \fIm\fR, or \fIg\fR are supported.
 .TP
 alias.*
@@ -429,7 +436,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"
+Controls which merge resolution program is used by \fBgit\-mergetool\fR(l). Valid values are: "kdiff3", "tkdiff", "meld", "xxdiff", "emerge", "vimdiff"
 .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 eace2c0cb11d22c9c49d4a20cd2d47533a815164..013a1acc4c0b5045335ac2efc25c8f47e903827a 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" "03/14/2007" "" ""
+.TH "GIT\-MERGETOOL" "1" "03/19/2007" "" ""
 .\" 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, and emerge.
+Use the merge resolution program specified by <tool>. Valid merge tools are: kdiff3, tkdiff, meld, xxdiff, emerge, and vimdiff.
 .sp
 .nf
 If a merge resolution program is not specified, 'git mergetool'

diff --git a/man1/git-send-email.1 b/man1/git-send-email.1
index 8a3dcc315ed4d6ec57258db9040f321e935db810..9ffaab3b6f2afaa9ea32493258ce88e0c0377090 100644 (file)
--- a/man1/git-send-email.1
+++ b/man1/git-send-email.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\-SEND\-EMAIL" "1" "03/12/2007" "" ""
+.TH "GIT\-SEND\-EMAIL" "1" "03/19/2007" "" ""
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -41,7 +41,7 @@ Specify the sender of the emails. This will default to the value GIT_COMMITTER_I
 Specify the contents of the first In\-Reply\-To header. Subsequent emails will refer to the previous email instead of this if \-\-chain\-reply\-to is set (the default) Only necessary if \-\-compose is also set. If \-\-compose is not set, this will be prompted for.
 .TP
 \-\-no\-signed\-off\-by\-cc
-Do not add emails found in Signed\-off\-by: lines to the cc list.
+Do not add emails found in Signed\-off\-by: or Cc: lines to the cc list.
 .TP
 \-\-quiet
 Make git\-send\-email less verbose. One line per email should be all that is output.