summaryrefslogtreecommitdiffstats
path: root/gitdiffcore.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-10 15:02:36 -0800
committerJunio C Hamano <gitster@pobox.com>2017-03-10 15:02:36 -0800
commit53eec4d7df316d46d4de248964486ecfbcda0c99 (patch)
treeca3f2544626ab474fbdff9eea2020b373633b22e /gitdiffcore.txt
parentcbe0eb29622a497f18818e4481f27636446b86d7 (diff)
downloadgit-htmldocs-53eec4d7df316d46d4de248964486ecfbcda0c99.tar.gz
Autogenerated HTML docs for v2.12.0-244-g62556
Diffstat (limited to 'gitdiffcore.txt')
-rw-r--r--gitdiffcore.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/gitdiffcore.txt b/gitdiffcore.txt
index 46bc6d077..c0a60f315 100644
--- a/gitdiffcore.txt
+++ b/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