summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-16 16:47:10 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-16 16:47:10 -0700
commit7a77754cf6fde7b513da1283fe76179ffa930ecc (patch)
tree3923485c3d4f775b41c1907dca4cd9bbc4ab3c52 /Documentation/config.txt
parent018443526875456d335fef2dfbc78bc4de2d340d (diff)
parent02a481fc6aef5d8a52f900448657d1cbe7c963ef (diff)
downloadgit-7a77754cf6fde7b513da1283fe76179ffa930ecc.tar.gz
Merge branch 'ci/commit--interactive-atomic'
* ci/commit--interactive-atomic: Test atomic git-commit --interactive Add commit to list of config.singlekey commands Add support for -p/--patch to git-commit Allow git commit --interactive with paths t7501.8: feed a meaningful command Use a temporary index for git commit --interactive
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 285c7f73ca..1a060ecbc8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1310,9 +1310,10 @@ 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 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.
+ linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1],
+ linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this
+ setting is silently ignored if portable keystroke input
+ is not available.
log.date::
Set the default date-time mode for the 'log' command.