]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f3d508f b2b1f61)
Merge branch 'jc/denoise-rm-to-resolve'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 20:59:24 +0000 (13:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Jul 2019 20:59:24 +0000 (13:59 -0700)
commit5e9d9787d278331385dbfcf962b32dc4e8d3eb5e
tree627b8d02082e85236c166a4806fda794626f96cctree | snapshot
parentf3d508f40e3d85fdbe1dafe8f33782766c88dbddcommit | diff
parentb2b1f615ce3b9383a32dec7f84488284004224f3commit | diff
Merge branch 'jc/denoise-rm-to-resolve'

"git rm" to resolve a conflicted path leaked an internal message
"needs merge" before actually removing the path, which was
confusing.  This has been corrected.

* jc/denoise-rm-to-resolve:
  rm: resolving by removal is not a warning-worthy event
builtin/rm.c diff1 | diff2 | blob | history
t/t3600-rm.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.