From 81c711d2a9a496ba11cf26049580b3d02c21783f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 20 Apr 2007 07:20:14 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.1.1-190-g74474 --- git-archive.html | 12 ++++++++++-- git-archive.txt | 5 ++++- git-cherry-pick.html | 4 ++-- git-cherry-pick.txt | 2 +- git-config.html | 31 ++++++++++++++++++++----------- git-config.txt | 24 ++++++++++++++---------- tutorial.html | 6 +++--- tutorial.txt | 2 +- 8 files changed, 55 insertions(+), 31 deletions(-) diff --git a/git-archive.html b/git-archive.html index 39cd9adce..616c72d1b 100644 --- a/git-archive.html +++ b/git-archive.html @@ -302,7 +302,7 @@ comment.

---list +--list, -l

@@ -310,6 +310,14 @@ comment.

+--verbose, -v +
+
+

+ Report progress to stderr. +

+
+
--prefix=<prefix>/
@@ -445,7 +453,7 @@ git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-d diff --git a/git-archive.txt b/git-archive.txt index 8d1041598..d3ca9a90c 100644 --- a/git-archive.txt +++ b/git-archive.txt @@ -33,9 +33,12 @@ OPTIONS Format of the resulting archive: 'tar', 'zip'... The default is 'tar'. ---list:: +--list, -l:: Show all available formats. +--verbose, -v:: + Report progress to stderr. + --prefix=/:: Prepend / to each filename in the archive. diff --git a/git-cherry-pick.html b/git-cherry-pick.html index ccd872ad6..1ee2b6964 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html @@ -320,7 +320,7 @@ modifications from the HEAD commit).

--r|--replay +-r

@@ -362,7 +362,7 @@ effect to your working tree in a row.

diff --git a/git-cherry-pick.txt b/git-cherry-pick.txt index 3149d08da..68bba9826 100644 --- a/git-cherry-pick.txt +++ b/git-cherry-pick.txt @@ -38,7 +38,7 @@ OPTIONS development branch), adding this information can be useful. --r|--replay:: +-r:: It used to be that the command defaulted to do `-x` described above, and `-r` was to disable it. Now the default is not to do `-x` so this option is a no-op. diff --git a/git-config.html b/git-config.html index 8245cf398..7ed664e53 100644 --- a/git-config.html +++ b/git-config.html @@ -273,16 +273,16 @@ git-config(1) Manual Page

SYNOPSIS

-
git-config [--global] [type] name [value [value_regex]] -git-config [--global] [type] --add name value -git-config [--global] [type] --replace-all name [value [value_regex]] -git-config [--global] [type] --get name [value_regex] -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
+
git-config [--system | --global] [type] name [value [value_regex]] +git-config [--system | --global] [type] --add name value +git-config [--system | --global] [type] --replace-all name [value [value_regex]] +git-config [--system | --global] [type] --get name [value_regex] +git-config [--system | --global] [type] --get-all name [value_regex] +git-config [--system | --global] [type] --unset name [value_regex] +git-config [--system | --global] [type] --unset-all name [value_regex] +git-config [--system | --global] [type] --rename-section old_name new_name +git-config [--system | --global] [type] --remove-section name +git-config [--system | --global] -l | --list

DESCRIPTION

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

+--system +
+
+

+ Use system-wide $(prefix)/etc/gitconfig rather than the repository + .git/config. +

+
+
--remove-section
@@ -1608,7 +1617,7 @@ transfer.unpackLimit diff --git a/git-config.txt b/git-config.txt index c759efb7f..280ef2058 100644 --- a/git-config.txt +++ b/git-config.txt @@ -9,16 +9,16 @@ git-config - Get and set repository or global options SYNOPSIS -------- [verse] -'git-config' [--global] [type] name [value [value_regex]] -'git-config' [--global] [type] --add name value -'git-config' [--global] [type] --replace-all name [value [value_regex]] -'git-config' [--global] [type] --get name [value_regex] -'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 +'git-config' [--system | --global] [type] name [value [value_regex]] +'git-config' [--system | --global] [type] --add name value +'git-config' [--system | --global] [type] --replace-all name [value [value_regex]] +'git-config' [--system | --global] [type] --get name [value_regex] +'git-config' [--system | --global] [type] --get-all name [value_regex] +'git-config' [--system | --global] [type] --unset name [value_regex] +'git-config' [--system | --global] [type] --unset-all name [value_regex] +'git-config' [--system | --global] [type] --rename-section old_name new_name +'git-config' [--system | --global] [type] --remove-section name +'git-config' [--system | --global] -l | --list DESCRIPTION ----------- @@ -76,6 +76,10 @@ OPTIONS --global:: Use global ~/.gitconfig file rather than the repository .git/config. +--system:: + Use system-wide $(prefix)/etc/gitconfig rather than the repository + .git/config. + --remove-section:: Remove the given section from the configuration file. diff --git a/tutorial.html b/tutorial.html index b15174633..8d47b3def 100644 --- a/tutorial.html +++ b/tutorial.html @@ -355,8 +355,8 @@ make it real.

Note: don't forget to add a file again if you modified it after the first add and before commit. Otherwise only the previous added state of that file will be committed. This is because git tracks -content, so what you're really add'ing to the commit is the content -of the file in the state it is in when you 'add it.

+content, so what you're really adding to the commit is the content +of the file in the state it is in when you add it.

2) By using git commit -a directly

This is a quick way to automatically add the content from all files that were modified since the previous commit, and perform the actual @@ -781,7 +781,7 @@ digressions that may be interesting at this point are:

diff --git a/tutorial.txt b/tutorial.txt index 129c5c5f5..e978562d6 100644 --- a/tutorial.txt +++ b/tutorial.txt @@ -111,7 +111,7 @@ make it real. Note: don't forget to 'add' a file again if you modified it after the first 'add' and before 'commit'. Otherwise only the previous added state of that file will be committed. This is because git tracks -content, so what you're really 'add'ing to the commit is the *content* +content, so what you're really 'adding' to the commit is the *content* of the file in the state it is in when you 'add' it. 2) By using 'git commit -a' directly -- 2.26.2