diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-04-26 03:29:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-26 03:29:09 -0700 |
| commit | b8ed7f0f40743dae6111c8950ba55051933298ca (patch) | |
| tree | ff4ebce0cdaf2c9c493eb38fd22f8e9d8d705bc0 /diff.h | |
| parent | test-dump-cache-tree: report number of subtrees. (diff) | |
| parent | commit-tree: allow generic object name for the tree as well. (diff) | |
| download | tgif-b8ed7f0f40743dae6111c8950ba55051933298ca.tar.xz | |
Merge branch 'master' into jc/cache-tree
* master:
commit-tree: allow generic object name for the tree as well.
Makefile: remove and create xdiff library from scratch.
t0000-basic: Add ls-tree recursive test back.
Libified diff-index: backward compatibility fix.
Libify diff-index.
Libify diff-files.
Makefile: remove and create libgit.a from scratch.
Document the configuration file
Document git-var -l listing also configuration variables
rev-parse: better error message for ambiguous arguments
make update-index --chmod work with multiple files and --stdin
socksetup: don't return on set_reuse_addr() error
Fix "git show --stat"
git-update-index --unresolve
Add git-unresolve <paths>...
Add colordiff for git to contrib/colordiff.
gitk: Let git-rev-list do the argument list parsing
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 */ |