Merge branch 'ja/do-not-ask-needless-questions' into maint
commit0501b7e78564d11e87d228f7ffdbdb4b147145e3
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:58 +0000 (4 10:20 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:59 +0000 (4 10:20 +0900)
treedd388bb6e4b8ca0bb876fe0ceec01379d492d0fc
parentc95f0d2f9d616132db863992959b05545f8578cc
parent6963893943dacc1a532d047c83ce905818dece46
Merge branch 'ja/do-not-ask-needless-questions' into maint

Git sometimes gives an advice in a rhetorical question that does
not require an answer, which can confuse new users and non native
speakers.  Attempt to rephrase them.

* ja/do-not-ask-needless-questions:
  git-filter-branch: be more direct in an error message
  read-tree -m: make error message for merging 0 trees less smart aleck
  usability: don't ask questions if no reply is required
Documentation/git-read-tree.txt
builtin/am.c
builtin/checkout.c
builtin/read-tree.c