From d814b6de0197ec2c339a8d2de7f7d9a890c25b11 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 4 Nov 2007 11:13:49 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.3.5-561-g140d --- RelNotes-1.5.3.5.txt | 4 ++-- config.txt | 9 +++++++++ git-cherry-pick.html | 16 ++++++++++++++-- git-cherry-pick.txt | 9 ++++++++- git-clone.html | 4 ++-- git-clone.txt | 2 +- git-config.html | 16 +++++++++++++++- git-revert.html | 16 ++++++++++++++-- git-revert.txt | 9 ++++++++- 9 files changed, 73 insertions(+), 12 deletions(-) diff --git a/RelNotes-1.5.3.5.txt b/RelNotes-1.5.3.5.txt index 4e46d2c2a..f99a2cd65 100644 --- a/RelNotes-1.5.3.5.txt +++ b/RelNotes-1.5.3.5.txt @@ -63,8 +63,8 @@ Fixes since v1.5.3.4 * Git segfaulted when reading an invalid .gitattributes file. Fixed. - * post-receive-email example hook fixed was fixed for - non-fast-forward updates. + * post-receive-email example hook was fixed for non-fast-forward + updates. * Documentation updates for supported (but previously undocumented) options of "git-archive" and "git-reflog". diff --git a/config.txt b/config.txt index edf50cd21..0df004ea2 100644 --- a/config.txt +++ b/config.txt @@ -661,6 +661,15 @@ pack.threads:: machines. The required amount of memory for the delta search window is however multiplied by the number of threads. +pack.indexVersion:: + Specify the default pack index version. Valid values are 1 for + legacy pack index used by Git versions prior to 1.5.2, and 2 for + the new pack index with capabilities for packs larger than 4 GB + as well as proper protection against the repacking of corrupted + packs. Version 2 is selected and this config option ignored + whenever the corresponding pack is larger than 2 GB. Otherwise + the default is 1. + pull.octopus:: The default merge strategy to use when pulling multiple branches at once. diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 3e510498e..1aee1b041 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -272,7 +272,7 @@ git-cherry-pick(1) Manual Page

SYNOPSIS

-

git-cherry-pick [--edit] [-n] [-x] <commit>

+

git-cherry-pick [--edit] [-n] [-m parent-number] [-x] <commit>

DESCRIPTION

@@ -331,6 +331,18 @@ modifications from the HEAD commit).

+-m parent-number|--mainline parent-number +
+
+

+ Usually you cannot revert a merge because you do not know which + side of the merge should be considered the mainline. This + option specifies the parent number (starting from 1) of + the mainline and allows cherry-pick to replay the change + relative to the specified parent. +

+
+
-n|--no-commit
@@ -363,7 +375,7 @@ effect to your working tree in a row.

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 76a2edfd9..937c4a792 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -7,7 +7,7 @@ git-cherry-pick - Apply the change introduced by an existing commit SYNOPSIS -------- -'git-cherry-pick' [--edit] [-n] [-x] +'git-cherry-pick' [--edit] [-n] [-m parent-number] [-x] DESCRIPTION ----------- @@ -44,6 +44,13 @@ OPTIONS described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op. +-m parent-number|--mainline parent-number:: + Usually you cannot revert a merge because you do not know which + side of the merge should be considered the mainline. This + option specifies the parent number (starting from 1) of + the mainline and allows cherry-pick to replay the change + relative to the specified parent. + -n|--no-commit:: Usually the command automatically creates a commit with a commit log message stating which commit was diff --git a/git-clone.html b/git-clone.html index 5305119f2..2ee6ec290 100644 --- a/git-clone.html +++ b/git-clone.html @@ -276,7 +276,7 @@ git-clone(1) Manual Page
git-clone [--template=<template_directory>] [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [-o <name>] [-u <upload-pack>] [--reference <repository>] - [--depth <depth>] <repository> [<directory>]
+ [--depth <depth>] [--] <repository> [<directory>]

DESCRIPTION

@@ -641,7 +641,7 @@ Create a repository on the kernel.org machine that borrows from Linus
diff --git a/git-clone.txt b/git-clone.txt index cca14d6b5..14e58f386 100644 --- a/git-clone.txt +++ b/git-clone.txt @@ -12,7 +12,7 @@ SYNOPSIS 'git-clone' [--template=] [-l] [-s] [--no-hardlinks] [-q] [-n] [--bare] [-o ] [-u ] [--reference ] - [--depth ] [] + [--depth ] [--] [] DESCRIPTION ----------- diff --git a/git-config.html b/git-config.html index b57444bf1..662d72453 100644 --- a/git-config.html +++ b/git-config.html @@ -1715,6 +1715,20 @@ pack.threads

+pack.indexVersion +
+
+

+ Specify the default pack index version. Valid values are 1 for + legacy pack index used by Git versions prior to 1.5.2, and 2 for + the new pack index with capabilities for packs larger than 4 GB + as well as proper protection against the repacking of corrupted + packs. Version 2 is selected and this config option ignored + whenever the corresponding pack is larger than 2 GB. Otherwise + the default is 1. +

+
+
pull.octopus
@@ -1942,7 +1956,7 @@ transfer.unpackLimit diff --git a/git-revert.html b/git-revert.html index 6bd6c71d5..56562a375 100644 --- a/git-revert.html +++ b/git-revert.html @@ -272,7 +272,7 @@ git-revert(1) Manual Page

SYNOPSIS

-

git-revert [--edit | --no-edit] [-n] <commit>

+

git-revert [--edit | --no-edit] [-n] [-m parent-number] <commit>

DESCRIPTION

@@ -304,6 +304,18 @@ modifications from the HEAD commit).

+-m parent-number|--mainline parent-number +
+
+

+ Usually you cannot revert a merge because you do not know which + side of the merge should be considered the mainline. This + option specifies the parent number (starting from 1) of + the mainline and allows revert to reverse the change + relative to the specified parent. +

+
+
--no-edit
@@ -345,7 +357,7 @@ effect to your working tree in a row.

diff --git a/git-revert.txt b/git-revert.txt index 69db49844..3457c4078 100644 --- a/git-revert.txt +++ b/git-revert.txt @@ -7,7 +7,7 @@ git-revert - Revert an existing commit SYNOPSIS -------- -'git-revert' [--edit | --no-edit] [-n] +'git-revert' [--edit | --no-edit] [-n] [-m parent-number] DESCRIPTION ----------- @@ -27,6 +27,13 @@ OPTIONS message prior committing the revert. This is the default if you run the command from a terminal. +-m parent-number|--mainline parent-number:: + Usually you cannot revert a merge because you do not know which + side of the merge should be considered the mainline. This + option specifies the parent number (starting from 1) of + the mainline and allows revert to reverse the change + relative to the specified parent. + --no-edit:: With this option, `git-revert` will not start the commit message editor. -- 2.26.2