From 83d46a2997fadfa1cbb85053f1c7315fa3591d67 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 21 Feb 2008 02:29:42 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4.2-184-gb23b --- config.txt | 7 +++++++ git-add.html | 6 +++--- git-add.txt | 4 ++-- git-config.html | 14 +++++++++++++- git-stash.html | 6 ++++-- git-stash.txt | 5 ++++- 6 files changed, 33 insertions(+), 9 deletions(-) diff --git a/config.txt b/config.txt index f2f6a774e..7b676710b 100644 --- a/config.txt +++ b/config.txt @@ -489,6 +489,13 @@ color.status.:: commit.template:: Specify a file to use as the template for new commit messages. +color.ui:: + When set to `always`, always use colors in all git commands which + are capable of colored output. When false (or `never`), never. When + set to `true` or `auto`, use colors only when the output is to the + terminal. When more specific variables of color.* are set, they always + take precedence over this setting. Defaults to false. + diff.autorefreshindex:: When using `git diff` to compare with work tree files, do not consider stat-only change as changed. diff --git a/git-add.html b/git-add.html index 9aea63bc4..5ff570c90 100644 --- a/git-add.html +++ b/git-add.html @@ -368,8 +368,8 @@ commit.

Update only files that git already knows about. This is similar to what "git commit -a" does in preparation for making a commit, except that the update is limited to paths specified on the - command line. If no paths are specified, all tracked files are - updated. + command line. If no paths are specified, all tracked files in the + current directory and its subdirectories are updated.

@@ -585,7 +585,7 @@ diff diff --git a/git-add.txt b/git-add.txt index 9d2ac865d..47799097c 100644 --- a/git-add.txt +++ b/git-add.txt @@ -74,8 +74,8 @@ OPTIONS Update only files that git already knows about. This is similar to what "git commit -a" does in preparation for making a commit, except that the update is limited to paths specified on the - command line. If no paths are specified, all tracked files are - updated. + command line. If no paths are specified, all tracked files in the + current directory and its subdirectories are updated. \--refresh:: Don't add the file(s), but only refresh their stat() diff --git a/git-config.html b/git-config.html index 95a9a3d67..d4c029bbd 100644 --- a/git-config.html +++ b/git-config.html @@ -1391,6 +1391,18 @@ commit.template

+color.ui +
+
+

+ When set to always, always use colors in all git commands which + are capable of colored output. When false (or never), never. When + set to true or auto, use colors only when the output is to the + terminal. When more specific variables of color.* are set, they always + take precedence over this setting. Defaults to false. +

+
+
diff.autorefreshindex
@@ -2266,7 +2278,7 @@ web.browser diff --git a/git-stash.html b/git-stash.html index 24afdd1cb..0300f0c60 100644 --- a/git-stash.html +++ b/git-stash.html @@ -310,7 +310,7 @@ save [<message>]

-list +list [<options>]

@@ -325,6 +325,8 @@ list 

stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation
 stash@{1}: On master: 9cc0589... Add git-stash
+

The command takes options applicable to the git-log(1) +command to control what is shown and how.

show [<stash>] @@ -461,7 +463,7 @@ $ git stash apply diff --git a/git-stash.txt b/git-stash.txt index cd0dc1bd9..48e6f5a3f 100644 --- a/git-stash.txt +++ b/git-stash.txt @@ -43,7 +43,7 @@ save []:: subcommand is given. The part is optional and gives the description along with the stashed state. -list:: +list []:: List the stashes that you currently have. Each 'stash' is listed with its name (e.g. `stash@\{0}` is the latest stash, `stash@\{1}` is @@ -55,6 +55,9 @@ list:: stash@{0}: WIP on submit: 6ebd0e2... Update git-stash documentation stash@{1}: On master: 9cc0589... Add git-stash ---------------------------------------------------------------- ++ +The command takes options applicable to the linkgit:git-log[1] +command to control what is shown and how. show []:: -- 2.26.2