diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:50:40 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-18 13:50:40 -0700 |
| commit | c0cca589fd41bab8548de6e777f389a1d55baf0b (patch) | |
| tree | a8233bc05c6e7bdcb98971b1f86a017362694053 /Documentation | |
| parent | 9befb340dde630c6766ae17b9a00250ec471c4ba (diff) | |
| parent | e650d0643b43c5681d7ef213aa070ea406eabf0a (diff) | |
| download | git-c0cca589fd41bab8548de6e777f389a1d55baf0b.tar.gz | |
Merge branch 'jk/doc-deprecate-grafts'
* jk/doc-deprecate-grafts:
docs: mark info/grafts as outdated
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/gitrepository-layout.txt | 4 | ||||
| -rw-r--r-- | Documentation/glossary-content.txt | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt index aa03882ddb..17d2ea6c1e 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@ -176,6 +176,10 @@ info/grafts:: per line describes a commit and its fake parents by listing their 40-byte hexadecimal object names separated 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:: This file, by convention among Porcelains, stores the diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index 378306f581..be0858c188 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -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 is different from what was recorded when the commit was 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:: In Git's context, synonym for <<def_object_name,object name>>. |