]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
"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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.