From 27c8f8cda42b9e47dc18e94152b28472488bef1c Mon Sep 17 00:00:00 2001 From: Andrew Ruder Date: Wed, 18 Apr 2007 22:03:14 -0500 Subject: Update git-archive documentation Documentation/git-archive.txt: Document -v/--verbose option. Add -l as short form of --list. Signed-off-by: Andrew Ruder Signed-off-by: Junio C Hamano diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index 493474b..59dfabe 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -32,9 +32,12 @@ OPTIONS --format=:: Format of the resulting archive: 'tar', 'zip'... ---list:: +--list, -l:: Show all available formats. +--verbose, -v:: + Report progress to stderr. + --prefix=/:: Prepend / to each filename in the archive. -- cgit v0.10.2-6-g49f6 From 6b04600a34a89241e7b1eb344667c8146a5dc99e Mon Sep 17 00:00:00 2001 From: Andrew Ruder Date: Wed, 18 Apr 2007 22:03:26 -0500 Subject: Update git-cherry-pick documentation Documentation/git-cherry-pick.txt: Remove --replay as it is not handled by the code (-r is however). Signed-off-by: Andrew Ruder Signed-off-by: Junio C Hamano diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 3149d08..68bba98 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/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. -- cgit v0.10.2-6-g49f6 From c91ee2714ecd01594cf2feef57157098dc486590 Mon Sep 17 00:00:00 2001 From: Andrew Ruder Date: Wed, 18 Apr 2007 22:03:31 -0500 Subject: Fix unmatched emphasis tag in git-tutorial In asciidoc 7.1.2 and prior there is no obvious way to get: 'add'ing to emphasize only the "add", instead it treats the first apostrophe as the beginning of an emphasis, and the second apostrophe as a regular apostrophe and makes the rest of the line an emphasis since there is no closing apostrophe. In the newer asciidoc you can do it pretty easily with __add__ing but I'm not sure it would be best to make that a prereq for something as silly as this. Signed-off-by: Andrew Ruder Signed-off-by: Junio C Hamano diff --git a/Documentation/tutorial.txt b/Documentation/tutorial.txt index 129c5c5..e978562 100644 --- a/Documentation/tutorial.txt +++ b/Documentation/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 -- cgit v0.10.2-6-g49f6 From 9bc20aa73152784ee758f6432e20820e581c9412 Mon Sep 17 00:00:00 2001 From: Andrew Ruder Date: Wed, 18 Apr 2007 22:03:37 -0500 Subject: Update git-config documentation Documentation/git-config.txt: Added documentation for --system Documentation/builtin-config.c: Added --system to the short usage Signed-off-by: Andrew Ruder Signed-off-by: Junio C Hamano diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index c759efb..280ef20 100644 --- a/Documentation/git-config.txt +++ b/Documentation/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/builtin-config.c b/builtin-config.c index dfa403b..b2515f7 100644 --- a/builtin-config.c +++ b/builtin-config.c @@ -2,7 +2,7 @@ #include "cache.h" static const char git_config_set_usage[] = -"git-config [ --global ] [ --bool | --int ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list"; +"git-config [ --global | --system ] [ --bool | --int ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list"; static char *key; static regex_t *key_regexp; -- cgit v0.10.2-6-g49f6