diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-10-31 01:42:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-10-31 01:42:58 -0700 |
| commit | 933bb3ae5e6c83288ec7c80c2282984f4927cb48 (patch) | |
| tree | ddd8cba625475e53e370471f61ea0fcba2f64921 /Documentation/gitattributes.txt | |
| parent | 797484392a823c66bd846545a43d76aa2c64f5ff (diff) | |
| parent | e855bfc0404d3344787541c1bdaa1e8d44398eb3 (diff) | |
| download | git-933bb3ae5e6c83288ec7c80c2282984f4927cb48.tar.gz git-933bb3ae5e6c83288ec7c80c2282984f4927cb48.tar.xz | |
Merge branch 'maint'
* maint:
git-svn: change dashed git-commit-tree to git commit-tree
Documentation: clarify information about 'ident' attribute
bash completion: add doubledash to "git show"
Use test-chmtime -v instead of perl in t5000 to get mtime of a file
Add --verbose|-v to test-chmtime
asciidoc: add minor workaround to add an empty line after code blocks
Plug a memleak in builtin-revert
Add file delete/create info when we overflow rename_limit
Install git-cvsserver in $(bindir)
Install git-shell in bindir, too
Diffstat (limited to 'Documentation/gitattributes.txt')
| -rw-r--r-- | Documentation/gitattributes.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 26945593c..24e880c5b 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -163,8 +163,8 @@ few exceptions. Even though... `ident` ^^^^^^^ -When the attribute `ident` is set to a path, git replaces -`$Id$` in the blob object with `$Id:`, followed by +When the attribute `ident` is set for a path, git replaces +`$Id$` in the blob object with `$Id:`, followed by the 40-character hexadecimal blob object name, followed by a dollar sign `$` upon checkout. Any byte sequence that begins with `$Id:` and ends with `$` in the worktree file is replaced |