From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Sat, 28 Apr 2018 22:44:53 +0000 (+0200)
Subject: filter-branch: stop suggesting to use grafts
X-Git-Tag: v2.18.0-rc0~54^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e2d65c1ea810f34681c3f3aba03c58b6e8484b3f;p=thirdparty%2Fgit.git

filter-branch: stop suggesting to use grafts

The graft file is deprecated now, so let's use replace refs in the example
in filter-branch's man page instead.

Suggested-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index b634043183..1d4d2f8604 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -288,7 +288,7 @@ git filter-branch --parent-filter \
 or even simpler:
 
 -----------------------------------------------
-echo "$commit-id $graft-id" >> .git/info/grafts
+git replace --graft $commit-id $graft-id
 git filter-branch $graft-id..HEAD
 -----------------------------------------------