Merge branch 'jc/diff-irreversible-delete'

* jc/diff-irreversible-delete: git diff -D: omit the preimage of deletes
2011-04-28 14:11:47 -07:00
parent 76a89d6d82 467ddc14fe
commit 50d3062ab2
4 changed files with 70 additions and 6 deletions
--- 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;