diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-25 23:12:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-25 23:12:21 -0700 |
| commit | e9b5b75ca87f45292de8ecde5d4d0512ac9542cd (patch) | |
| tree | be4cc0707c97c8bbd2dc4699f646f886fe2739a9 /diff.h | |
| parent | 71459c193d04870076efa0a387c317390b53e3e2 (diff) | |
| parent | 5c21ac0e7c475c82039ab604ee9d7d8430889346 (diff) | |
| download | git-e9b5b75ca87f45292de8ecde5d4d0512ac9542cd.tar.xz | |
Merge branch 'jc/diff'
* jc/diff:
Libified diff-index: backward compatibility fix.
Libify diff-index.
Libify diff-files.
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -28,10 +28,11 @@ struct diff_options { with_raw:1, with_stat:1, tree_in_recursive:1, - full_index:1; + full_index:1, + silent_on_remove:1, + find_copies_harder:1; int break_opt; int detect_rename; - int find_copies_harder; int line_termination; int output_format; int pickaxe_opts; @@ -168,4 +169,8 @@ extern void diff_flush(struct diff_options*); extern const char *diff_unique_abbrev(const unsigned char *, int); +extern int run_diff_files(struct rev_info *revs, int silent_on_removed); + +extern int run_diff_index(struct rev_info *revs, int cached); + #endif /* DIFF_H */ |