From 30dfad45d35c536bdd00b526cf3852f6ab76aba2 Mon Sep 17 00:00:00 2001 From: Kp Date: Thu, 5 Jul 2018 04:03:40 +0000 Subject: [PATCH] Update historical/d2x graft instructions Git upstream deprecated support for grafts and added a noisy warning when grafts are found. Update the instructions to use the replacement mechanism based on `git replace --graft`. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fc6b3b4a0..3b61e1014 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -This branch contains the Git commits created from the Subversion history of the D2X snapshot used as the base for D2X-Rebirth. To attach this history to the D2X-Rebirth history, fetch this branch, then `echo b94413b91b0a66cbc1d53054afc268bf0962d752 5288754d8952a9abade5ee908c9c5aa04e45b1e9 >> .git/info/grafts`. This will enable `git blame`, `git log`, and similar tools to trace from D2X-Rebirth history into D2X history. +This branch contains the Git commits created from the Subversion history of the D2X snapshot used as the base for D2X-Rebirth. To attach this history to the D2X-Rebirth history, fetch this branch, then `git replace --graft b94413b91b0a66cbc1d53054afc268bf0962d752 5288754d8952a9abade5ee908c9c5aa04e45b1e9`. This will enable `git blame`, `git log`, and similar tools to trace from D2X-Rebirth history into D2X history. For full history of D2X, including activity after the snapshot used for D2X-Rebirth, see [btb/d2x.git](https://github.com/btb/d2x).