git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marcus Comstedt <marcus@mc.pp.se>
To: git@vger.kernel.org
Cc: gitster@pobox.com
Subject: [PATCH v3 4/4] Documentation: document foreign idents
Date: Sat, 18 Sep 2010 15:53:59 +0200	[thread overview]
Message-ID: <c2829398f87f35f24522a780fa82b1250a15b7c8.1284820251.git.marcus@mc.pp.se> (raw)
In-Reply-To: <cover.1284820251.git.marcus@mc.pp.se>

Add a short paragraph to the "ident" documentation about the
semantics and intended use of foreign idents.

Signed-off-by: Marcus Comstedt <marcus@mc.pp.se>
Signed-off-by: Henrik Grubbström <grubba@grubba.org>
---
 Documentation/gitattributes.txt |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index e5a27d8..9af1d6f 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -272,6 +272,13 @@ sign `$` upon checkout.  Any byte sequence that begins with
 `$Id:` and ends with `$` in the worktree file is replaced
 with `$Id$` upon check-in.
 
+When converting a repository from a different version control
+system, it can be useful to create blobs which contain expanded
+`$Id$` tags.  Git will recognize such "foreign idents" if they
+contain at least one space within the payload.  A foreign ident
+will be replaced by `$Id$` upon check-in, but is left unaltered
+upon checkout.
+
 
 `filter`
 ^^^^^^^^
-- 
1.7.2

      parent reply	other threads:[~2010-09-18 14:47 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-09-18 14:30 [PATCH v3 0/4] fix normalization of foreign idents Marcus Comstedt
2010-08-23  7:05 ` [PATCH v3 2/4] convert: " Marcus Comstedt
2010-09-18 21:31   ` Junio C Hamano
2010-09-18 22:38     ` Marcus Comstedt
2010-09-07 19:16 ` [PATCH v3 3/4] t0021: test checkout and commit " Marcus Comstedt
2010-09-13 22:00 ` [PATCH v3 1/4] convert: generalize checksafe parameter Marcus Comstedt
2010-09-18 13:53 ` Marcus Comstedt [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c2829398f87f35f24522a780fa82b1250a15b7c8.1284820251.git.marcus@mc.pp.se \
    --to=marcus@mc.pp.se \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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 NNTP newsgroup(s).