Merge branch 'ls/editor-waiting-message'
commit0c69a132cb1adf0ce9f31e6631f89321e437cb76
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:59 +0000 (19 11:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:59 +0000 (19 11:33 -0800)
tree96b88504e01e80a17c98d85d4f56e2025ddd548a
parentbdae4af87053490adad2dc9fb184d6d050d46a4c
parentabfb04d0c74cde804c734015ff5868a88c84fb6f
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
Documentation/config.txt
advice.c
advice.h
cache.h