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/gitdiffcore.txt | |
| parent | Merge branch 'jk/doc-http-backend' into maint (diff) | |
| parent | glossary: improve definitions of refspec and pathspec (diff) | |
| download | git-76f9bc9f53a7bc72950d8ee88e88bf41903fab74.tar.gz git-76f9bc9f53a7bc72950d8ee88e88bf41903fab74.zip | |
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/gitdiffcore.txt')
| -rw-r--r-- | Documentation/gitdiffcore.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index 4ed71c76cb..568d75783a 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -108,7 +108,7 @@ it changes it to: For the purpose of breaking a filepair, diffcore-break examines the extent of changes between the contents of the files before and after modification (i.e. the contents that have "bcd1234..." -and "0123456..." as their SHA1 content ID, in the above +and "0123456..." as their SHA-1 content ID, in the above example). The amount of deletion of original contents and insertion of new material are added together, and if it exceeds the "break score", the filepair is broken into two. The break |