diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-11-18 19:34:09 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-11-18 19:34:09 -0800 |
commit | b98769e06e50009b1b7b1ca465c0f3b0cf0f6fa3 (patch) | |
tree | b877918ea547a05430fc340d0b91bc361e7bed69 /Documentation | |
parent | 611addf8900efc19a859f3f0afc680fe53831527 (diff) | |
parent | 11fbe18e9e36b28642b41ecfbc9156eff08ce92c (diff) | |
download | git-b98769e06e50009b1b7b1ca465c0f3b0cf0f6fa3.tar.gz |
Merge branch 'po/maint-refs-replace-docs' into maint
The refs/replace hierarchy was not mentioned in the
repository-layout docs.
* po/maint-refs-replace-docs:
Doc repository-layout: Show refs/replace
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/gitrepository-layout.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt index 5c891f1169..9f628862b4 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@ -93,6 +93,12 @@ refs/remotes/`name`:: records tip-of-the-tree commit objects of branches copied from a remote repository. +refs/replace/`<obj-sha1>`:: + records the SHA1 of the object that replaces `<obj-sha1>`. + This is similar to info/grafts and is internally used and + maintained by linkgit:git-replace[1]. Such refs can be exchanged + between repositories while grafts are not. + packed-refs:: records the same information as refs/heads/, refs/tags/, and friends record in a more efficient way. See |