diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-25 13:59:24 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-25 13:59:24 -0700 |
| commit | 5e9d9787d278331385dbfcf962b32dc4e8d3eb5e (patch) | |
| tree | 627b8d02082e85236c166a4806fda794626f96cc /builtin/commit.c | |
| parent | Merge branch 'js/clean-report-too-long-a-path' (diff) | |
| parent | rm: resolving by removal is not a warning-worthy event (diff) | |
| download | git-5e9d9787d278331385dbfcf962b32dc4e8d3eb5e.tar.gz git-5e9d9787d278331385dbfcf962b32dc4e8d3eb5e.zip | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions