summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2016-04-19 15:21:30 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-19 17:53:34 (GMT)
commitd634d61ed6c5f19948937012b5e3a0ed2d631d3f (patch)
treef5c443c8ae8a4def49ffd7f147ccc82ab1420805 /Documentation/diff-options.txt
parent92e5b62fec0e9b647429e8d3736c571c434dd375 (diff)
downloadgit-d634d61ed6c5f19948937012b5e3a0ed2d631d3f.zip
git-d634d61ed6c5f19948937012b5e3a0ed2d631d3f.tar.gz
git-d634d61ed6c5f19948937012b5e3a0ed2d631d3f.tar.bz2
xdiff: implement empty line chunk heuristic
In order to produce the smallest possible diff and combine several diff hunks together, we implement a heuristic from GNU Diff which moves diff hunks forward as far as possible when we find common context above and below a diff hunk. This sometimes produces less readable diffs when writing C, Shell, or other programming languages, ie: ... /* + * + * + */ + +/* ... instead of the more readable equivalent of ... +/* + * + * + */ + /* ... Implement the following heuristic to (optionally) produce the desired output. If there are diff chunks which can be shifted around, shift each hunk such that the last common empty line is below the chunk with the rest of the context above. This heuristic appears to resolve the above example and several other common issues without producing significantly weird results. However, as with any heuristic it is not really known whether this will always be more optimal. Thus, it can be disabled via diff.compactionHeuristic. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 3ad6404..b513023 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -63,6 +63,12 @@ ifndef::git-format-patch[]
Synonym for `-p --raw`.
endif::git-format-patch[]
+--compaction-heuristic::
+--no-compaction-heuristic::
+ These are to help debugging and tuning an experimental
+ heuristic that shifts the hunk boundary in an attempt to
+ make the resulting patch easier to read.
+
--minimal::
Spend extra time to make sure the smallest possible
diff is produced.