undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/doc-deprecate-grafts'

Browse Source 
* jk/doc-deprecate-grafts:
  docs: mark info/grafts as outdated
This commit is contained in:
Junio C Hamano 2014-03-18 13:50:40 -07:00
commit c0cca589fd
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/gitrepository-layout.txt
View File

@ -176,6 +176,10 @@ info/grafts::
per line describes a commit and its fake parents by per line describes a commit and its fake parents by
listing their 40-byte hexadecimal object names separated listing their 40-byte hexadecimal object names separated
by a space and terminated by a newline. by a space and terminated by a newline.
+
Note that the grafts mechanism is outdated and can lead to problems
transferring objects between repositories; see linkgit:git-replace[1]
for a more flexible and robust system to do the same thing.
info/exclude:: info/exclude::
This file, by convention among Porcelains, stores the This file, by convention among Porcelains, stores the

4
Documentation/glossary-content.txt
View File

@ -176,6 +176,10 @@ current branch integrates with) obviously do not work, as there is no
you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has
is different from what was recorded when the commit was is different from what was recorded when the commit was
created. Configured via the `.git/info/grafts` file. created. Configured via the `.git/info/grafts` file.
+
Note that the grafts mechanism is outdated and can lead to problems
transferring objects between repositories; see linkgit:git-replace[1]
for a more flexible and robust system to do the same thing.
[[def_hash]]hash:: [[def_hash]]hash::
In Git's context, synonym for <<def_object_name,object name>>. In Git's context, synonym for <<def_object_name,object name>>.