summaryrefslogtreecommitdiffstats
path: root/gitattributes.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junio@hera.kernel.org>2007-05-15 03:13:17 +0000
committerJunio C Hamano <junio@hera.kernel.org>2007-05-15 03:13:17 +0000
commit0430e3a874bf1f6935be905e8539d77d41f48a62 (patch)
treeabb023ef457cf5e0d2cc84e690c27ffcd1112a89 /gitattributes.txt
parent323e52dd2e49bceead5c67a881e8dc79db63e52c (diff)
downloadgit-htmldocs-0430e3a874bf1f6935be905e8539d77d41f48a62.tar.gz
Autogenerated HTML docs for v1.5.2-rc3-39-gaf9b
Diffstat (limited to 'gitattributes.txt')
-rw-r--r--gitattributes.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/gitattributes.txt b/gitattributes.txt
index 87723105d..d3ac9c718 100644
--- a/gitattributes.txt
+++ b/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