git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
* [PATCH] Doc repository-layout: Show refs/replace
@ 2012-10-21 20:52 Philip Oakley
  2012-10-25 10:34 ` Jeff King
  0 siblings, 1 reply; 2+ messages in thread
From: Philip Oakley @ 2012-10-21 20:52 UTC (permalink / raw)
  To: GitList; +Cc: Philip Oakley

Signed-off-by: Philip Oakley <philipoakley@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

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Doc repository-layout: Show refs/replace
  2012-10-21 20:52 [PATCH] Doc repository-layout: Show refs/replace Philip Oakley
@ 2012-10-25 10:34 ` Jeff King
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff King @ 2012-10-25 10:34 UTC (permalink / raw)
  To: Philip Oakley; +Cc: GitList

On Sun, Oct 21, 2012 at 09:52:37PM +0100, Philip Oakley wrote:

> Signed-off-by: Philip Oakley <philipoakley@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

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-10-25 10:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-21 20:52 [PATCH] Doc repository-layout: Show refs/replace Philip Oakley
2012-10-25 10:34 ` Jeff King

Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).