global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-29 01:50:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jl/maint-diff-ignore-submodules' into next

Browse Source 
* jl/maint-diff-ignore-submodules:
  Add optional parameters to the diff option "--ignore-submodules"
  git diff: rename test that had a conflicting name
This commit is contained in:
Junio C Hamano
2010-06-23 10:56:35 -07:00
parent e61649cc3b dd44d419d3
commit 057acb7908
6 changed files with 118 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
diff.h
View File

@@ -74,6 +74,7 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
#define DIFF_OPT_SUBMODULE_LOG (1 << 23)
#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
#define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag)