diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-18 22:48:06 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-18 22:48:06 (GMT) |
| commit | d54fe394acbad36e9d0fd960d5e10f2769a8041b (patch) | |
| tree | ffd71f86a9a602f4b52d2e518a530d5a2de2921f /diff.h | |
| parent | 304de2d2d6afc7500fe9b8f2e22dd0a16a902d8b (diff) | |
| parent | 0c66d6be4f888096865b8f3d5fdc00c83e4ecc3f (diff) | |
| download | git-d54fe394acbad36e9d0fd960d5e10f2769a8041b.zip git-d54fe394acbad36e9d0fd960d5e10f2769a8041b.tar.gz git-d54fe394acbad36e9d0fd960d5e10f2769a8041b.tar.bz2 | |
Merge branch 'ar/diff'
* ar/diff:
Add tests for --quiet option of diff programs
try-to-simplify-commit: use diff-tree --quiet machinery.
revision.c: explain what tree_difference does
Teach --quiet to diff backends.
diff --quiet
Remove unused diffcore_std_no_resolve
Allow git-diff exit with codes similar to diff(1)
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -56,7 +56,10 @@ struct diff_options { silent_on_remove:1, find_copies_harder:1, color_diff:1, - color_diff_words:1; + color_diff_words:1, + has_changes:1, + quiet:1, + exit_with_status:1; int context; int break_opt; int detect_rename; @@ -170,8 +173,6 @@ extern int diff_setup_done(struct diff_options *); extern void diffcore_std(struct diff_options *); -extern void diffcore_std_no_resolve(struct diff_options *); - #define COMMON_DIFF_OPTIONS_HELP \ "\ncommon diff options:\n" \ " -z output diff-raw with lines terminated with NUL.\n" \ |