diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2007-05-15 03:13:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2007-05-15 03:13:17 +0000 |
| commit | 0430e3a874bf1f6935be905e8539d77d41f48a62 (patch) | |
| tree | abb023ef457cf5e0d2cc84e690c27ffcd1112a89 /gitattributes.html | |
| parent | 323e52dd2e49bceead5c67a881e8dc79db63e52c (diff) | |
| download | git-htmldocs-0430e3a874bf1f6935be905e8539d77d41f48a62.tar.gz | |
Autogenerated HTML docs for v1.5.2-rc3-39-gaf9b
Diffstat (limited to 'gitattributes.html')
| -rw-r--r-- | gitattributes.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gitattributes.html b/gitattributes.html index 770fcdb3a..46825d921 100644 --- a/gitattributes.html +++ b/gitattributes.html @@ -414,11 +414,11 @@ converted to LF upon checkin, but there is no conversion done upon checkout.</p>
<h4><tt>ident</tt></h4>
<p>When the attribute <tt>ident</tt> is set to a path, git replaces
-<tt>$ident$</tt> in the blob object with <tt>$ident:</tt>, followed by
+<tt>$Id$</tt> in the blob object with <tt>$Id:</tt>, followed by
40-character hexadecimal blob object name, followed by a dollar
sign <tt>$</tt> upon checkout. Any byte sequence that begins with
-<tt>$ident:</tt> and ends with <tt>$</tt> in the worktree file is replaced
-with <tt>$ident$</tt> upon check-in.</p>
+<tt>$Id:</tt> and ends with <tt>$</tt> in the worktree file is replaced
+with <tt>$Id$</tt> upon check-in.</p>
<h4>Interaction between checkin/checkout attributes</h4>
<p>In the check-in codepath, the worktree file is first converted
with <tt>ident</tt> (if specified), and then with <tt>crlf</tt> (again, if
@@ -658,7 +658,7 @@ frotz unspecified</tt></pre> </div>
<div id="footer">
<div id="footer-text">
-Last updated 29-Apr-2007 18:29:52 UTC
+Last updated 15-May-2007 03:12:38 UTC
</div>
</div>
</body>
|