| commit | 671e629d6eab689cb685fb375997c60b2cbcbab7 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 1 Dec 2018 12:41:42 +0000 (1 21:41 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 1 Dec 2018 12:41:42 +0000 (1 21:41 +0900) | ||
| tree | 124921a060aae857a641160c23f9e8976f5cf3b0 | treesnapshot (tar.gz zip) |
| parent | 881d72eff8b0d23c8edc6f8d9673f8daafaace6f | commitdiff |
| parent | 8821e90a09a6b86b92213882f3b9945bc21b94d1 | commitdiff |
Merge branch 'ab/replace-graft-with-replace-advice'
The advice message to tell the user to migrate an existing graft
file to the replace system when a graft file was read was shown
even when "git replace --convert-graft-file" command, which is the
way the message suggests to use, was running, which made little
sense.
* ab/replace-graft-with-replace-advice:
advice: don't pointlessly suggest --convert-graft-file
The advice message to tell the user to migrate an existing graft
file to the replace system when a graft file was read was shown
even when "git replace --convert-graft-file" command, which is the
way the message suggests to use, was running, which made little
sense.
* ab/replace-graft-with-replace-advice:
advice: don't pointlessly suggest --convert-graft-file
| builtin/replace.c | diff1 | diff2 | blobhistory |