projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c2796ac 9b906af)
Merge branch 'ct/mv-unmerged-path-error' into master
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2020 20:20:35 +0000 (13:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Jul 2020 20:20:35 +0000 (13:20 -0700)
commitbe2dab9c801fe28a6937e8d426f891e610a82a49
tree110244fa8330ee5cd0a0ffe30f398a69a83e6acatree | snapshot
parentc2796ac1c2807a46d1db90e47c892ba96bfdb276commit | diff
parent9b906af657d4ec0bc8fc01c5cbbbddb582a8cac6commit | diff
Merge branch 'ct/mv-unmerged-path-error' into master

"git mv src dst", when src is an unmerged path, errored out
correctly but with an incorrect error message to claim that src is
not tracked, which has been clarified.

* ct/mv-unmerged-path-error:
  git-mv: improve error message for conflicted file
Unnamed repository; edit this file 'description' to name the repository.