Re: [PATCH] Doc repository-layout: Show refs/replace

2012-10-25 Thread Jeff King
On Sun, Oct 21, 2012 at 09:52:37PM +0100, Philip Oakley wrote:

 Signed-off-by: Philip Oakley philipoak...@iee.org

Thanks, this makes sense.

 +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 `git replace`. Such refs can be exchanged between
 + repositories while grafts are not.

This should probably be an actual link to the git-replace manpage. I'll
convert it to a linkgit. No need to resend.

-Peff
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH] Doc repository-layout: Show refs/replace

2012-10-21 Thread Philip Oakley
Signed-off-by: Philip Oakley philipoak...@iee.org
---

My question on stackoverflow http://stackoverflow.com/questions/6800692
how-do-git-grafts-and-replace-differ-are-grafts-now-deprecated
noted that the gitrepository-layout(5) wasn't up to date. 

Recent hits have propmted me to offer a patch.

Here is that patch.

Philip

---

 Documentation/gitrepository-layout.txt | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/Documentation/gitrepository-layout.txt 
b/Documentation/gitrepository-layout.txt
index 5c891f1..d546e20 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 `git replace`. 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
-- 
1.7.11.msysgit.1

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html