diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:58 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:58 -0700 |
| commit | 76f9bc9f53a7bc72950d8ee88e88bf41903fab74 (patch) | |
| tree | 739bf070864f02f2f6ae94562cfa6f459b863ed3 /Documentation/git-replace.txt | |
| parent | 56303b8bb5b62ee02c8cc6c953fd572abf6ee53c (diff) | |
| parent | 57148ebb30fd7ed72acf7b3fc6f59d7cf2d94643 (diff) | |
| download | git-76f9bc9f53a7bc72950d8ee88e88bf41903fab74.tar.xz | |
Merge branch 'ta/glossary' into maint
* 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-replace.txt')
| -rw-r--r-- | Documentation/git-replace.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 0142cd18ae..e0b4057976 100644 --- a/Documentation/git-replace.txt +++ b/Documentation/git-replace.txt @@ -16,8 +16,8 @@ DESCRIPTION ----------- Adds a 'replace' reference in `refs/replace/` namespace. -The name of the 'replace' reference is the SHA1 of the object that is -replaced. The content of the 'replace' reference is the SHA1 of the +The name of the 'replace' reference is the SHA-1 of the object that is +replaced. The content of the 'replace' reference is the SHA-1 of the replacement object. Unless `-f` is given, the 'replace' reference must not yet exist. |