Merge branch 'jc/read-tree-empty-with-m' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:21:00 +0000 (10:21 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:21:00 +0000 (10:21 +0900)
commit8a17b259e2c9137c1653523e00a988cb3cee3a1f
tree971cb91c93753f1c0a88b20a5ac1eb0a8f840074
parent34a75ccb1dade147f404c0841c3f1ec777c0a97a
parentb9b10d36816b8c7276bb83eb08fdbb59f68ef99b
Merge branch 'jc/read-tree-empty-with-m' into maint

"git read-tree -m" (no tree-ish) gave a nonsense suggestion "use
--empty if you want to clear the index".  With "-m", such a request
will still fail anyway, as you'd need to name at least one tree-ish
to be merged.

* jc/read-tree-empty-with-m:
  read-tree: "read-tree -m --empty" does not make sense
builtin/read-tree.c