diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-05-25 13:37:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 13:37:08 -0700 |
| commit | 7e83003029ed488253f6173b047a9c77933c8561 (patch) | |
| tree | 191fd7e272b6adde953d76b974a3ed9de282b128 /Documentation | |
| parent | Merge branch 'mo/cvsserver' (diff) | |
| parent | Ignore dirty submodule states during rebase and stash (diff) | |
| download | tgif-7e83003029ed488253f6173b047a9c77933c8561.tar.xz | |
Merge branch 'js/ignore-submodule'
* js/ignore-submodule:
Ignore dirty submodule states during rebase and stash
Teach update-index about --ignore-submodules
diff options: Introduce --ignore-submodules
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 3 | ||||
| -rw-r--r-- | Documentation/git-update-index.txt | 5 |
2 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 13234fa280..859d67990a 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -228,6 +228,9 @@ endif::git-format-patch[] --no-ext-diff:: Disallow external diff drivers. +--ignore-submodules:: + Ignore changes to submodules in the diff generation. + --src-prefix=<prefix>:: Show the given source prefix instead of "a/". diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 66be18ef36..06640603c4 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -15,6 +15,7 @@ SYNOPSIS [--cacheinfo <mode> <object> <file>]\* [--chmod=(+|-)x] [--assume-unchanged | --no-assume-unchanged] + [--ignore-submodules] [--really-refresh] [--unresolve] [--again | -g] [--info-only] [--index-info] [-z] [--stdin] @@ -54,6 +55,10 @@ OPTIONS default behavior is to error out. This option makes git-update-index continue anyway. +--ignore-submodules: + Do not try to update submodules. This option is only respected + when passed before --refresh. + --unmerged:: If --refresh finds unmerged changes in the index, the default behavior is to error out. This option makes git-update-index |