summaryrefslogtreecommitdiff
path: root/Documentation/gitattributes.txt
diff options
context:
space:
mode:
authorAndy Parkins <andyparkins@gmail.com>2007-05-14 13:37:25 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-05-15 02:03:32 (GMT)
commitaf9b54bb2cb0e15780bf3e820b5f1ce399deb2c4 (patch)
treedc589b574cbadd85b0c573d6b5aed00262e6a693 /Documentation/gitattributes.txt
parent3545193735522f733fdb4e345f16ddf131e2007a (diff)
downloadgit-af9b54bb2cb0e15780bf3e820b5f1ce399deb2c4.zip
git-af9b54bb2cb0e15780bf3e820b5f1ce399deb2c4.tar.gz
git-af9b54bb2cb0e15780bf3e820b5f1ce399deb2c4.tar.bz2
Use $Id$ as the ident attribute keyword rather than $ident$ to be consistent with other VCSs
$Id$ is present already in SVN and CVS; it would mean that people converting their existing repositories won't have to make any changes to the source files should they want to make use of the ident attribute. Given that it's a feature that's meant to calm those very people, it seems obtuse to make them edit every file just to make use of it. I think that bzr uses $Id$; Mercurial has examples hooks for $Id$; monotone has $Id$ on its wishlist. I can't think of a good reason not to stick with the de-facto standard and call ours $Id$ instead of $ident$. Signed-off-by: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/gitattributes.txt')
-rw-r--r--Documentation/gitattributes.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 8772310..d3ac9c7 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -138,11 +138,11 @@ upon checkout.
^^^^^^^
When the attribute `ident` is set to a path, git replaces
-`$ident$` in the blob object with `$ident:`, followed by
+`$Id$` in the blob object with `$Id:`, followed by
40-character hexadecimal blob object name, followed by a dollar
sign `$` upon checkout. Any byte sequence that begins with
-`$ident:` and ends with `$` in the worktree file is replaced
-with `$ident$` upon check-in.
+`$Id:` and ends with `$` in the worktree file is replaced
+with `$Id$` upon check-in.
Interaction between checkin/checkout attributes