Merge branch 'nd/checkout-noisy-unmerge'
authorJunio C Hamano <gitster@pobox.com>
Sat, 9 Feb 2019 04:44:51 +0000 (20:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 9 Feb 2019 04:44:51 +0000 (20:44 -0800)
commit87c9831df0f5ae4e96ab2e5b9b5b50505baa8cf4
treecc10db1474240fda9cd1cb19287ec7e3ba235c8c
parentfd357c4270ea4b48e95fb475fdc9b6ce2ee447e1
parent1d1f689bef77b1bd0cb0f0bc0e0bd766283c5df8
Merge branch 'nd/checkout-noisy-unmerge'

"git checkout [<tree-ish>] <pathspec>" started reporting the number
of paths that have got updated recently, but the same messages were
given when "git checkout -m <pathspec>" to unresolve conflicts that
have just been resolved.  The message now reports these unresolved
paths separately from the paths that are checked out from the index.

* nd/checkout-noisy-unmerge:
  checkout: count and print -m paths separately
  checkout: update count-checkouts messages
builtin/checkout.c