]> git.neil.brown.name Git - git.git/commitdiff
Merge branch 'ja/do-not-ask-needless-questions'
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:48 +0000 (12:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 May 2017 03:34:48 +0000 (12:34 +0900)
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

1  2 
Documentation/git-read-tree.txt
builtin/am.c
builtin/checkout.c
builtin/read-tree.c

Simple merge
diff --cc builtin/am.c
Simple merge
Simple merge
Simple merge