From d15328acbacd5d5b1b56a7ee143ccf7db9e7549e Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 9 Mar 2007 09:06:40 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.0.3-316-gbd1fc --- git-config.html | 20 +++++++++++++++++++- git-config.txt | 8 ++++++++ git-fast-import.html | 20 ++++++++++++++++++-- git-fast-import.txt | 13 ++++++++++++- git.html | 2 +- 5 files changed, 58 insertions(+), 5 deletions(-) diff --git a/git-config.html b/git-config.html index f8f1a0a5e..78161b6d3 100644 --- a/git-config.html +++ b/git-config.html @@ -280,6 +280,8 @@ git-config(1) Manual Page git-config [--global] [type] --get-all name [value_regex] git-config [--global] [type] --unset name [value_regex] git-config [--global] [type] --unset-all name [value_regex] +git-config [--global] [type] --rename-section old_name new_name +git-config [--global] [type] --remove-section name git-config [--global] -l | --list

DESCRIPTION

@@ -394,6 +396,22 @@ you use --global option without $HOME being properly set.

+--remove-section +
+
+

+ Remove the given section from the configuration file. +

+
+
+--rename-section +
+
+

+ Rename the given section to a new name. +

+
+
--unset
@@ -1491,7 +1509,7 @@ transfer.unpackLimit diff --git a/git-config.txt b/git-config.txt index 6624484fe..68de5881b 100644 --- a/git-config.txt +++ b/git-config.txt @@ -16,6 +16,8 @@ SYNOPSIS 'git-config' [--global] [type] --get-all name [value_regex] 'git-config' [--global] [type] --unset name [value_regex] 'git-config' [--global] [type] --unset-all name [value_regex] +'git-config' [--global] [type] --rename-section old_name new_name +'git-config' [--global] [type] --remove-section name 'git-config' [--global] -l | --list DESCRIPTION @@ -74,6 +76,12 @@ OPTIONS --global:: Use global ~/.gitconfig file rather than the repository .git/config. +--remove-section:: + Remove the given section from the configuration file. + +--rename-section:: + Rename the given section to a new name. + --unset:: Remove the line matching the key from config file. diff --git a/git-fast-import.html b/git-fast-import.html index 5d50a332d..6ff782cf3 100644 --- a/git-fast-import.html +++ b/git-fast-import.html @@ -353,7 +353,23 @@ the frontend program in use.

Dumps the internal marks table to <file> when complete. Marks are written one per line as :markid SHA-1. Frontends can use this file to validate imports after they - have been completed. + have been completed, or to save the marks table across + incremental runs. As <file> is only opened and truncated + at checkpoint (or completion) the same path can also be + safely given to --import-marks. +

+
+
+--import-marks=<file> +
+
+

+ Before processing any input, load the marks specified in + <file>. The input file must exist, must be readable, and + must use the same format as produced by --export-marks. + Multiple options may be supplied to import more than one + set of marks. If a mark is defined to different values, + the last file wins.

@@ -1188,7 +1204,7 @@ memory footprint (less than 2.7 MiB per active branch).

diff --git a/git-fast-import.txt b/git-fast-import.txt index 77a14bb07..7e3d2b1a9 100644 --- a/git-fast-import.txt +++ b/git-fast-import.txt @@ -62,7 +62,18 @@ OPTIONS Dumps the internal marks table to when complete. Marks are written one per line as `:markid SHA-1`. Frontends can use this file to validate imports after they - have been completed. + have been completed, or to save the marks table across + incremental runs. As is only opened and truncated + at checkpoint (or completion) the same path can also be + safely given to \--import-marks. + +--import-marks=:: + Before processing any input, load the marks specified in + . The input file must exist, must be readable, and + must use the same format as produced by \--export-marks. + Multiple options may be supplied to import more than one + set of marks. If a mark is defined to different values, + the last file wins. --export-pack-edges=:: After creating a packfile, print a line of data to diff --git a/git.html b/git.html index 9824b5183..dfa720750 100644 --- a/git.html +++ b/git.html @@ -2309,7 +2309,7 @@ contributors on the git-list <git@vger.kernel.org>.

-- 2.26.2