From f21686fe7feb854d23e39aeb07d74dc1d8236fe1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 9 May 2007 07:16:10 +0000 Subject: [PATCH] Autogenerated manpages for v1.5.2-rc2-46-g4675 --- man1/git-config.1 | 5 ++++- man1/git-pack-objects.1 | 4 ++-- man1/git-repack.1 | 4 ++-- man7/git.7 | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/man1/git-config.1 b/man1/git-config.1 index dd6ce6010..b23ffa229 100644 --- 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" "05/04/2007" "Git 1.5.2.rc1.20.g86b9" "Git Manual" +.TH "GIT\-CONFIG" "1" "05/09/2007" "Git 1.5.2.rc2.46.g4675" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -476,6 +476,9 @@ Names a low\-level merge driver to be used when performing an internal merge bet pack.window The size of the window used by \fBgit\-pack\-objects\fR(1) when no window size is given on the command line. Defaults to 10. .TP +pack.depth +The maximum delta depth used by \fBgit\-pack\-objects\fR(1) when no maximum depth is given on the command line. Defaults to 50. +.TP pull.octopus The default merge strategy to use when pulling multiple branches at once. .TP diff --git a/man1/git-pack-objects.1 b/man1/git-pack-objects.1 index 1c6bdea67..cb5b658e3 100644 --- a/man1/git-pack-objects.1 +++ b/man1/git-pack-objects.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\-PACK\-OBJECTS" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual" +.TH "GIT\-PACK\-OBJECTS" "1" "05/09/2007" "Git 1.5.2.rc2.46.g4675" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -44,7 +44,7 @@ This implies \-\-revs. When processing the list of revision arguments read from This implies \-\-revs. In addition to the list of revision arguments read from the standard input, pretend as if all refs under $GIT_DIR/refs are specified to be included. .TP \-\-window=[N], \-\-depth=[N] -These two options affect how the objects contained in the pack are stored using delta compression. The objects are first internally sorted by type, size and optionally names and compared against the other objects within \-\-window to see if using delta compression saves space. \-\-depth limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object. The default value for both \-\-window and \-\-depth is 10. +These two options affect how the objects contained in the pack are stored using delta compression. The objects are first internally sorted by type, size and optionally names and compared against the other objects within \-\-window to see if using delta compression saves space. \-\-depth limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object. The default value for \-\-window is 10 and \-\-depth is 50. .TP \-\-incremental This flag causes an object already in a pack ignored even if it appears in the standard input. diff --git a/man1/git-repack.1 b/man1/git-repack.1 index 13940841a..756089509 100644 --- a/man1/git-repack.1 +++ b/man1/git-repack.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\-REPACK" "1" "04/22/2007" "Git 1.5.1.2.241.gfdd3e" "Git Manual" +.TH "GIT\-REPACK" "1" "05/09/2007" "Git 1.5.2.rc2.46.g4675" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -38,7 +38,7 @@ Pass the \-q option to git pack\-objects, see \fBgit\-pack\-objects\fR(1). Do not update the server information with git update\-server\-info. .TP \-\-window=[N], \-\-depth=[N] -These two options affect how the objects contained in the pack are stored using delta compression. The objects are first internally sorted by type, size and optionally names and compared against the other objects within \-\-window to see if using delta compression saves space. \-\-depth limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object. The default value for both \-\-window and \-\-depth is 10. +These two options affect how the objects contained in the pack are stored using delta compression. The objects are first internally sorted by type, size and optionally names and compared against the other objects within \-\-window to see if using delta compression saves space. \-\-depth limits the maximum delta depth; making it too deep affects the performance on the unpacker side, because delta data needs to be applied that many times to get to the necessary object. The default value for \-\-window is 10 and \-\-depth is 50. .SH "CONFIGURATION" When configuration variable repack.UseDeltaBaseOffset is set for the repository, the command passes \-\-delta\-base\-offset option to git\-pack\-objects; this typically results in slightly smaller packs, but the generated packs are incompatible with versions of git older than (and including) v1.4.3; do not set the variable in a repository that older version of git needs to be able to read (this includes repositories from which packs can be copied out over http or rsync, and people who obtained packs that way can try to use older git with it). .SH "AUTHOR" diff --git a/man7/git.7 b/man7/git.7 index 2c73c80df..8cf00c3c7 100644 --- 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" "05/08/2007" "Git 1.5.2.rc2.21.g3082" "Git Manual" +.TH "GIT" "7" "05/09/2007" "Git 1.5.2.rc2.46.g4675" "Git Manual" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) -- 2.26.2