diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-11-24 18:03:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-24 18:03:04 -0800 |
| commit | bc2b8eafaf074492e0489974b4086b3a0f354e7e (patch) | |
| tree | a5662a57c224c50309019386707eb95206248191 /diff.h | |
| parent | Merge branch 'jc/maint-format-patch-encoding' into maint (diff) | |
| parent | t2200: test more cases of "add -u" (diff) | |
| download | tgif-bc2b8eafaf074492e0489974b4086b3a0f354e7e.tar.xz | |
Merge branch 'jc/maint-add-sync-stat' into maint
* jc/maint-add-sync-stat:
t2200: test more cases of "add -u"
git-add: make the entry stat-clean after re-adding the same contents
ce_match_stat, run_diff_files: use symbolic constants for readability
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -224,7 +224,11 @@ 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); +/* do not report anything on removed paths */ +#define DIFF_SILENT_ON_REMOVED 01 +/* report racily-clean paths as modified */ +#define DIFF_RACY_IS_MODIFIED 02 +extern int run_diff_files(struct rev_info *revs, unsigned int option); extern int setup_diff_no_index(struct rev_info *revs, int argc, const char ** argv, int nongit, const char *prefix); extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv); |