diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-03-21 15:03:25 -0700 |
| commit | 5c6bc96896525726a37b6f03642f8d5de034cee8 (patch) | |
| tree | d818fd25bf1636c60a09d973e2fb7b8892e87ef6 | |
| parent | c157ae9c91535cf36ce58e75c1d008cea9e07a43 (diff) | |
| parent | b803ae4427f3e21f01b8da6933ed719909cacd69 (diff) | |
| download | git-5c6bc96896525726a37b6f03642f8d5de034cee8.tar.gz | |
Merge branch 'ps/docs-diffcore' into maint
Doc update.
* ps/docs-diffcore:
docs/diffcore: unquote "Complete Rewrites" in headers
docs/diffcore: fix grammar in diffcore-rename header
| -rw-r--r-- | Documentation/gitdiffcore.txt | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index 46bc6d077c..c0a60f3158 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -84,8 +84,8 @@ format sections of the manual for 'git diff-{asterisk}' commands) or diff-patch format. -diffcore-break: For Splitting Up "Complete Rewrites" ----------------------------------------------------- +diffcore-break: For Splitting Up Complete Rewrites +-------------------------------------------------- The second transformation in the chain is diffcore-break, and is controlled by the -B option to the 'git diff-{asterisk}' commands. This is @@ -119,7 +119,7 @@ the original is used), and can be customized by giving a number after "-B" option (e.g. "-B75" to tell it to use 75%). -diffcore-rename: For Detection Renames and Copies +diffcore-rename: For Detecting Renames and Copies ------------------------------------------------- This transformation is used to detect renames and copies, and is @@ -177,8 +177,8 @@ the expense of making it slower. Without `--find-copies-harder`, copied happened to have been modified in the same changeset. -diffcore-merge-broken: For Putting "Complete Rewrites" Back Together --------------------------------------------------------------------- +diffcore-merge-broken: For Putting Complete Rewrites Back Together +------------------------------------------------------------------ This transformation is used to merge filepairs broken by diffcore-break, and not transformed into rename/copy by |