X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=Documentation%2Fgitattributes.txt;h=d3ac9c718147042a89db90a87d75fee34e778e5a;hb=41ffe5cdf5b0192cd70ef71b1cc37c7286d1dab0;hp=87723105d1aeeab3cc9918ffc80503f4291e749c;hpb=679c7c56ed9f73db5892fe17ef9b67b84b0ca242;p=git.git diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 87723105d..d3ac9c718 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