undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ps/docs-diffcore'

Browse Source 
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:
Junio C Hamano 2017-03-10 13:24:23 -08:00
commit 9664cef1eb
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/gitdiffcore.txt
View File

@ -84,8 +84,8 @@ format sections of the manual for 'git diff-{asterisk}' commands) or
diff-patch format. 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 The second transformation in the chain is diffcore-break, and is
controlled by the -B option to the 'git diff-{asterisk}' commands. This 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%). 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 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. 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 This transformation is used to merge filepairs broken by
diffcore-break, and not transformed into rename/copy by diffcore-break, and not transformed into rename/copy by