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 /Documentation | |
| parent | 978327f97dd3bd20f1648a2fcac601191976b18c (diff) | |
| parent | 46a958b3daa1da336683ec82d7f321d0f51b39c8 (diff) | |
| download | git-a76b2084fb9c7e788108717fdce4c91227808980.tar.gz | |
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 'Documentation')
| -rw-r--r-- | Documentation/git-status.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index fd0fe7cb56..2fd054c104 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -53,6 +53,17 @@ See linkgit:git-config[1] for configuration variable used to change the default for when the option is not specified. +--ignore-submodules[=<when>]:: + Ignore changes to submodules when looking for changes. <when> can be + either "untracked", "dirty" or "all", which is the default. When + "untracked" is used submodules are not considered dirty when they only + contain untracked content (but they are still scanned for modified + content). Using "dirty" ignores all changes to the work tree of submodules, + only changes to the commits stored in the superproject are shown (this was + the behavior before 1.7.0). Using "all" hides all changes to submodules + (and suppresses the output of submodule summaries when the config option + `status.submodulesummary` is set). + -z:: Terminate entries with NUL, instead of LF. This implies the `--porcelain` output format if no other format is given. |