Merge branch 'ja/do-not-ask-needless-questions'
commite6381080a7dd44e14fba81b5e3714661343d8e62
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:48 +0000 (29 12:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:48 +0000 (29 12:34 +0900)
tree7f301cb317d03ea1d66401dc57d13d15caf0bf6b
parented9806014d06fb1757a45d7f789859b91d9fb765
parent6963893943dacc1a532d047c83ce905818dece46
Merge branch 'ja/do-not-ask-needless-questions'

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