]> git.ipfire.org Git - thirdparty/git.git/commit - diff.h
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5f9953d) | patch
diff: support anchoring line(s)
authorJonathan Tan <jonathantanmy@google.com>
Mon, 27 Nov 2017 19:47:47 +0000 (11:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Nov 2017 01:40:04 +0000 (10:40 +0900)
commit2477ab2ea8651920a9909f6d05b15ad9004a6c64
tree50a1cc585b71420b1da0230451ef932b114f809btree | snapshot
parent5f9953d2c365bffed6f9ee0c6966556bd4d7e2f4commit | diff
diff: support anchoring line(s)

Teach diff a new algorithm, one that attempts to prevent user-specified
lines from appearing as a deletion or addition in the end result. The
end user can use this by specifying "--anchored=<text>" one or more
times when using Git commands like "diff" and "show".

Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/diff-options.txt diff | blob | blame | history
diff.c diff | blob | blame | history
diff.h diff | blob | blame | history
t/t4065-diff-anchored.sh [new file with mode: 0755] blob
xdiff/xdiff.h diff | blob | blame | history
xdiff/xpatience.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.