diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-02-07 22:10:16 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-02-07 22:10:16 +0300 |
commit | c19923add0530567ff90e4c4e1bccbc5c0a837f7 (patch) | |
tree | 177bec12bc3f2be01f744981eb63daebd1ac915a /Documentation | |
parent | df4364a42981dec067dbacfd6371d4ca910df48e (diff) | |
parent | 748aa689bac2c1dd5d902815b0dec6364d20bf34 (diff) |
Merge branch 'tr/add-p-single'
* tr/add-p-single:
add -p: import Term::ReadKey with 'require'
add -p: print errors in separate color
add -p: prompt for single characters
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/config.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index 7fbf64d24c..1dd18c928d 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -569,8 +569,8 @@ color.interactive:: color.interactive.<slot>:: Use customized color for 'git-add --interactive' - output. `<slot>` may be `prompt`, `header`, or `help`, for - three distinct types of normal output from interactive + output. `<slot>` may be `prompt`, `header`, `help` or `error`, for + four distinct types of normal output from interactive programs. The values of these variables may be specified as in color.branch.<slot>. @@ -1013,6 +1013,13 @@ instaweb.port:: The port number to bind the gitweb httpd to. See linkgit:git-instaweb[1]. +interactive.singlekey:: + In interactive programs, allow the user to provide one-letter + input with a single key (i.e., without hitting enter). + Currently this is used only by the `\--patch` mode of + linkgit:git-add[1]. Note that this setting is silently + ignored if portable keystroke input is not available. + log.date:: Set default date-time mode for the log command. Setting log.date value is similar to using 'git-log'\'s --date option. The value is one of the |