summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-04-28 14:11:47 -0700
committerJunio C Hamano <gitster@pobox.com>2011-04-28 14:11:47 -0700
commit50d3062ab2cea4e999b8f3bafd211ff348bca600 (patch)
tree26cfdd46c59963b0301bd57d492a73f0abadbb5f /diff.h
parent76a89d6d828486f96f42c69ef0cf87bb6b72fef5 (diff)
parent467ddc14fe37ea6a3d77058fb24c4240e82e6344 (diff)
downloadgit-50d3062ab2cea4e999b8f3bafd211ff348bca600.tar.gz
Merge branch 'jc/diff-irreversible-delete'
* jc/diff-irreversible-delete: git diff -D: omit the preimage of deletes
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 b8dde8a750..6fe1597785 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;