diff options
| author | Martin Langhoff <martin@catalyst.net.nz> | 2006-05-01 10:20:56 +1200 |
|---|---|---|
| committer | Martin Langhoff <martin@catalyst.net.nz> | 2006-05-01 10:20:56 +1200 |
| commit | e660e3997fbad830e5723336d61883f3a50dbc92 (patch) | |
| tree | 0c02dced98df9982415c8328e8c07c1001e3dc31 /diff.h | |
| parent | 992793c832acfd98107068d90b886643f0344d04 (diff) | |
| parent | 66ae0c7702e68765dad17aa05c5d9255d999216c (diff) | |
| download | git-e660e3997fbad830e5723336d61883f3a50dbc92.tar.xz | |
Merge with git://kernel.org/pub/scm/git/git.git
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 */ |