mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
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
This commit is contained in:
commit
5c6bc96896
1 changed files with 5 additions and 5 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue