Merge branch 'ab/replace-graft-with-replace-advice'
authorJunio C Hamano <gitster@pobox.com>
Sat, 1 Dec 2018 12:41:42 +0000 (21:41 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sat, 1 Dec 2018 12:41:42 +0000 (21:41 +0900)
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

1  2 
builtin/replace.c
Simple merge