Skip to content

Commit c0cca58

Browse files
committed
Merge branch 'jk/doc-deprecate-grafts'
* jk/doc-deprecate-grafts: docs: mark info/grafts as outdated
2 parents 9befb34 + e650d06 commit c0cca58

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

Documentation/gitrepository-layout.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ info/grafts::
176176
per line describes a commit and its fake parents by
177177
listing their 40-byte hexadecimal object names separated
178178
by a space and terminated by a newline.
179+
+
180+
Note that the grafts mechanism is outdated and can lead to problems
181+
transferring objects between repositories; see linkgit:git-replace[1]
182+
for a more flexible and robust system to do the same thing.
179183

180184
info/exclude::
181185
This file, by convention among Porcelains, stores the

Documentation/glossary-content.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,10 @@ current branch integrates with) obviously do not work, as there is no
176176
you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has
177177
is different from what was recorded when the commit was
178178
created. Configured via the `.git/info/grafts` file.
179+
+
180+
Note that the grafts mechanism is outdated and can lead to problems
181+
transferring objects between repositories; see linkgit:git-replace[1]
182+
for a more flexible and robust system to do the same thing.
179183

180184
[[def_hash]]hash::
181185
In Git's context, synonym for <<def_object_name,object name>>.

0 commit comments

Comments
 (0)