diff options
| author |  Jeff King <peff@peff.net> | 2012-11-04 08:00:11 -0500 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-11-04 08:00:11 -0500 |
| commit | e52bec9469e6df752471d654fca56200d32a0392 (patch) | |
| tree | 9c49df0eedb9eb3bdcf18d0235796cc0a3ae29ec | |
| parent | Merge branch 'ph/pull-rebase-detached' (diff) | |
| parent | Doc repository-layout: Show refs/replace (diff) | |
| download | tgif-e52bec9469e6df752471d654fca56200d32a0392.tar.xz | |
Merge branch 'po/maint-refs-replace-docs'
The refs/replace hierarchy was not mentioned in the
repository-layout docs.
* po/maint-refs-replace-docs:
Doc repository-layout: Show refs/replace
| -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 |