summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2019-02-08 20:44:51 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-02-08 20:44:51 -0800
commit87c9831df0f5ae4e96ab2e5b9b5b50505baa8cf4 (patch)
treecc10db1474240fda9cd1cb19287ec7e3ba235c8c /resolve-undo.h
parentMerge branch 'js/smart-http-detect-remote-error' (diff)
parentcheckout: count and print -m paths separately (diff)
downloadtgif-87c9831df0f5ae4e96ab2e5b9b5b50505baa8cf4.tar.xz
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
Diffstat (limited to 'resolve-undo.h')
0 files changed, 0 insertions, 0 deletions