diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-30 11:55:39 -0700 |
| commit | a76b2084fb9c7e788108717fdce4c91227808980 (patch) | |
| tree | 7fa7cd5019490a51bea649141c795786b9c85017 /wt-status.h | |
| parent | 978327f97dd3bd20f1648a2fcac601191976b18c (diff) | |
| parent | 46a958b3daa1da336683ec82d7f321d0f51b39c8 (diff) | |
| download | git-a76b2084fb9c7e788108717fdce4c91227808980.tar.gz git-a76b2084fb9c7e788108717fdce4c91227808980.tar.xz | |
Merge branch 'jl/status-ignore-submodules'
* jl/status-ignore-submodules:
Add the option "--ignore-submodules" to "git status"
git submodule: ignore dirty submodules for summary and status
Conflicts:
builtin/commit.c
t/t7508-status.sh
wt-status.c
wt-status.h
Diffstat (limited to 'wt-status.h')
| -rw-r--r-- | wt-status.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/wt-status.h b/wt-status.h index 4cd74c4b3..9df9c9fad 100644 --- a/wt-status.h +++ b/wt-status.h @@ -45,6 +45,7 @@ struct wt_status { int submodule_summary; int show_ignored_files; enum untracked_status_type show_untracked_files; + const char *ignore_submodule_arg; char color_palette[WT_STATUS_REMOTE_BRANCH+1][COLOR_MAXLEN]; /* These are computed during processing of the individual sections */ |