summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-16 06:42:37 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-05-16 06:42:37 (GMT)
commit638684824c419f4368512c6f54ac32dd4e6c56a6 (patch)
treeb9d30b4c1911deade512f24e9abc6e5264b64a0f /diff.h
parent3b4fd63f72cb19288d23c9622366bbe32e55613f (diff)
parent9d76812b42009069aa3ff8f29e51b5150aa04e8e (diff)
downloadgit-638684824c419f4368512c6f54ac32dd4e6c56a6.zip
git-638684824c419f4368512c6f54ac32dd4e6c56a6.tar.gz
git-638684824c419f4368512c6f54ac32dd4e6c56a6.tar.bz2
Merge branch 'se/diff'
* se/diff: Convert some "apply --summary" users to "diff --summary". Add "--summary" option to git diff.
Diffstat (limited to 'diff.h')
-rw-r--r--diff.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index bef586d..3027974 100644
--- a/diff.h
+++ b/diff.h
@@ -31,7 +31,8 @@ struct diff_options {
binary:1,
full_index:1,
silent_on_remove:1,
- find_copies_harder:1;
+ find_copies_harder:1,
+ summary:1;
int context;
int break_opt;
int detect_rename;