]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2f72ebf b2b1f61)
Merge branch 'jc/denoise-rm-to-resolve' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:17 +0000 (12:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 29 Jul 2019 19:38:17 +0000 (12:38 -0700)
commit9c65991abd7c954be8c3a1414f6cf365b83ee317
treec1b9516750692954a948cc7beafdea1088b00378tree | snapshot
parent2f72ebfcd02b06a19e6c5429fcfc78b5fc754144commit | diff
parentb2b1f615ce3b9383a32dec7f84488284004224f3commit | diff
Merge branch 'jc/denoise-rm-to-resolve' into maint

"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.