diff options
author | Andy Parkins <andyparkins@gmail.com> | 2007-05-14 14:37:25 +0100 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2007-05-14 19:03:32 -0700 |
commit | af9b54bb2cb0e15780bf3e820b5f1ce399deb2c4 (patch) | |
tree | dc589b574cbadd85b0c573d6b5aed00262e6a693 /Documentation | |
parent | 3545193735522f733fdb4e345f16ddf131e2007a (diff) | |
download | git-af9b54bb2cb0e15780bf3e820b5f1ce399deb2c4.tar.gz |
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')
-rw-r--r-- | Documentation/RelNotes-1.5.2.txt | 2 | ||||
-rw-r--r-- | Documentation/gitattributes.txt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/RelNotes-1.5.2.txt b/Documentation/RelNotes-1.5.2.txt index d1c2cac4fc..7dbdb26988 100644 --- a/Documentation/RelNotes-1.5.2.txt +++ b/Documentation/RelNotes-1.5.2.txt @@ -26,7 +26,7 @@ Updates since v1.5.1 considered a binary or text (the former would be treated by 'git diff' not to produce textual output; the latter can go through the line endings conversion process in repositories - with core.autocrlf set), expand and unexpand '$ident$' keyword + with core.autocrlf set), expand and unexpand '$Id$' keyword with blob object name, specify a custom 3-way merge driver, and specify a custom diff driver. You can also apply arbitrary filter to contents on check-in/check-out codepath diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 87723105d1..d3ac9c7181 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 |