diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-21 18:40:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-21 18:40:15 -0700 |
| commit | ad77690fe400d91d3da97e16c07f1a8591b19b99 (patch) | |
| tree | 6b6264e1b76b1afc438856473ca45ad052a99b0c /Documentation/git-merge-index.txt | |
| parent | c6c4d616739b531b5689b78fbcb2c89d14e70a4f (diff) | |
| parent | 57148ebb30fd7ed72acf7b3fc6f59d7cf2d94643 (diff) | |
| download | git-ad77690fe400d91d3da97e16c07f1a8591b19b99.tar.gz | |
Merge branch 'ta/glossary'
* ta/glossary:
glossary: improve definitions of refspec and pathspec
The name of the hash function is "SHA-1", not "SHA1"
glossary: improve description of SHA-1 related topics
glossary: remove outdated/misleading/irrelevant entries
Diffstat (limited to 'Documentation/git-merge-index.txt')
| -rw-r--r-- | Documentation/git-merge-index.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index 0c80cec0e8..02676fb391 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- This looks up the <file>(s) in the index and, if there are any merge -entries, passes the SHA1 hash for those files as arguments 1, 2, 3 (empty +entries, passes the SHA-1 hash for those files as arguments 1, 2, 3 (empty argument if no file), and <file> as argument 4. File modes for the three files are passed as arguments 5, 6 and 7. |