diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:25:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-24 16:25:43 -0700 |
| commit | b6a7a06aa6f083f21b0fca2558c737324eda1602 (patch) | |
| tree | 75032ee8528906017e5ef773733b590e29fbf2fa /diff.h | |
| parent | 797d44343c831680aeae3392259fcadeb178bf61 (diff) | |
| parent | 3bfc45047654c7dd38b32033321228e97fc8f60e (diff) | |
| download | git-b6a7a06aa6f083f21b0fca2558c737324eda1602.tar.gz | |
Merge branch 'jl/submodule-diff-dirtiness'
* jl/submodule-diff-dirtiness:
git status: ignoring untracked files must apply to submodules too
git status: Fix false positive "new commits" output for dirty submodules
Refactor dirty submodule detection in diff-lib.c
git status: Show detailed dirty status of submodules in long format
git diff --submodule: Show detailed dirty status of submodules
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -69,6 +69,8 @@ typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, #define DIFF_OPT_ALLOW_TEXTCONV (1 << 21) #define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22) #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_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) #define DIFF_OPT_SET(opts, flag) ((opts)->flags |= DIFF_OPT_##flag) |