From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 1 Dec 2018 12:41:42 +0000 (+0900)
Subject: Merge branch 'ab/replace-graft-with-replace-advice'
X-Git-Tag: v2.20.0-rc2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=671e629d6eab689cb685fb375997c60b2cbcbab7;p=thirdparty%2Fgit.git

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

671e629d6eab689cb685fb375997c60b2cbcbab7