diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-04-14 12:26:45 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-04-14 12:26:45 -0700 |
| commit | 4d8b32a2e1758236c4c1b714f179892e3bce982c (patch) | |
| tree | 88de20125ca7645de923cf7abf7b1d69fa7b1105 /Documentation/git.txt | |
| parent | 865d370c4daf21e3d6dd48708fc4b716b63d795c (diff) | |
| parent | 810cae53e0f622d6804f063c04a83dbc3a11b7ca (diff) | |
| download | git-4d8b32a2e1758236c4c1b714f179892e3bce982c.tar.gz git-4d8b32a2e1758236c4c1b714f179892e3bce982c.tar.xz | |
Merge branch 'maint'
* maint:
archive: document limitation of tar.umask config setting
t3306,t5304: avoid clock skew issues
git.txt: fix list continuation
Diffstat (limited to 'Documentation/git.txt')
| -rw-r--r-- | Documentation/git.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/git.txt b/Documentation/git.txt index 7df49ea0d..b8fa77b7a 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -622,7 +622,6 @@ where: contents of <old|new>, <old|new>-hex:: are the 40-hexdigit SHA1 hashes, <old|new>-mode:: are the octal representation of the file modes. - + The file parameters can point at the user's working file (e.g. `new-file` in "git-diff-files"), `/dev/null` (e.g. `old-file` |