summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-03-01 00:11:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-04-03 06:52:20 (GMT)
commit467ddc14fe37ea6a3d77058fb24c4240e82e6344 (patch)
tree14e77a41ab3361c97ead322efd2c86f851dcb8fc /diff.h
parentafb0b7933f31e984caf6fb835f6afe6eb37d918c (diff)
downloadgit-467ddc14fe37ea6a3d77058fb24c4240e82e6344.zip
git-467ddc14fe37ea6a3d77058fb24c4240e82e6344.tar.gz
git-467ddc14fe37ea6a3d77058fb24c4240e82e6344.tar.bz2
git diff -D: omit the preimage of deletes
When reviewing a patch while concentrating primarily on the text after then change, wading through pages of deleted text involves a cognitive burden. Introduce the -D option that omits the preimage text from the patch output for deleted files. When used with -B (represent total rewrite as a single wholesale deletion followed by a single wholesale addition), the preimage text is also omitted. To prevent such a patch from being applied by mistake, the output is designed not to be usable by "git apply" (or GNU "patch"); it is strictly for human consumption. It of course is possible to "apply" such a patch by hand, as a human can read the intention out of such a patch. It however is impossible to apply such a patch even manually in reverse, as the whole point of this option is to omit the information necessary to do so from the output. Initial request by Mart Sõmermaa, documentation and tests helped by Michael J Gruber. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/diff.h b/diff.h
index 310bd6b..11d13cf 100644
--- a/diff.h
+++ b/diff.h
@@ -104,6 +104,7 @@ struct diff_options {
int interhunkcontext;
int break_opt;
int detect_rename;
+ int irreversible_delete;
int skip_stat_unmatch;
int line_termination;
int output_format;