aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-12-19 11:33:59 -0800
committerJunio C Hamano <gitster@pobox.com>2017-12-19 11:33:59 -0800
commit0c69a132cb1adf0ce9f31e6631f89321e437cb76 (patch)
tree96b88504e01e80a17c98d85d4f56e2025ddd548a /Documentation
parentbdae4af87053490adad2dc9fb184d6d050d46a4c (diff)
parentabfb04d0c74cde804c734015ff5868a88c84fb6f (diff)
downloadgit-0c69a132cb1adf0ce9f31e6631f89321e437cb76.tar.gz
git-0c69a132cb1adf0ce9f31e6631f89321e437cb76.tar.xz
Merge branch 'ls/editor-waiting-message'
Git shows a message to tell the user that it is waiting for the user to finish editing when spawning an editor, in case the editor opens to a hidden window or somewhere obscure and the user gets lost. * ls/editor-waiting-message: launch_editor(): indicate that Git waits for user input refactor "dumb" terminal determination
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9fac2f2b8..b18c0f97f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -354,6 +354,9 @@ advice.*::
ignoredHook::
Advice shown if an hook is ignored because the hook is not
set as executable.
+ waitingForEditor::
+ Print a message to the terminal whenever Git is waiting for
+ editor input from the user.
--
core.fileMode::