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)
commit671e629d6eab689cb685fb375997c60b2cbcbab7
tree124921a060aae857a641160c23f9e8976f5cf3b0
parent881d72eff8b0d23c8edc6f8d9673f8daafaace6f
parent8821e90a09a6b86b92213882f3b9945bc21b94d1
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
builtin/replace.c