Merge branch 'nd/checkout-noisy'
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2019 23:29:28 +0000 (15:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2019 23:29:29 +0000 (15:29 -0800)
"git checkout [<tree-ish>] path..." learned to report the number of
paths that have been checked out of the index or the tree-ish,
which gives it the same degree of noisy-ness as the case in which
the command checks out a branch.

* nd/checkout-noisy:
  t0027: squelch checkout path run outside test_expect_* block
  checkout: print something when checking out paths

1  2 
apply.c
builtin/checkout-index.c
builtin/checkout.c
entry.c
unpack-trees.c

diff --cc apply.c
Simple merge
Simple merge
Simple merge
diff --cc entry.c
Simple merge
diff --cc unpack-trees.c
Simple merge