summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-31 12:01:06 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-31 12:01:06 -0700
commit398dbe536d5e94b7f7263fc4900b5e6f788f495a (patch)
treeaaedf855fe5cf0ffb4fb88c7b7eb22de6a81af0d /Documentation/config.txt
parent82ca09090ef0615732a53e2d07414382ca8d1fe4 (diff)
parent6086ff65dfcf48237bdac6c64a85bef5d34d5b4e (diff)
downloadgit-398dbe536d5e94b7f7263fc4900b5e6f788f495a.tar.gz
Merge branch 'vh/config-interactive-singlekey-doc' into maint
* vh/config-interactive-singlekey-doc: git-reset.txt: better docs for '--patch' git-checkout.txt: better docs for '--patch' git-stash.txt: better docs for '--patch' git-add.txt: document 'interactive.singlekey' config.txt: 'interactive.singlekey; is used by...
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index cc6d480101..d16136210a 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1307,8 +1307,9 @@ instaweb.port::
interactive.singlekey::
In interactive commands, 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
+ Currently this is used by the `\--patch` mode of
+ linkgit:git-add[1], linkgit:git-reset[1], linkgit:git-stash[1] and
+ linkgit:git-checkout[1]. Note that this setting is silently
ignored if portable keystroke input is not available.
log.date::