diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-05-29 15:21:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 15:21:47 -0700 |
| commit | 727a46b2f9a1ce69eaf09bc46cb129f1c40833d8 (patch) | |
| tree | d50f3e0ef75db0761cce98aaa88f26271ba1968e | |
| parent | Start 1.8.4 cycle (diff) | |
| parent | Start 1.8.3.1 maintenance track (diff) | |
| download | tgif-727a46b2f9a1ce69eaf09bc46cb129f1c40833d8.tar.xz | |
Sync with maint
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/diff-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 104579dc75..b8a9b86375 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -480,7 +480,7 @@ endif::git-format-patch[] --ignore-submodules[=<when>]:: Ignore changes to submodules in the diff generation. <when> can be - either "none", "untracked", "dirty" or "all", which is the default + either "none", "untracked", "dirty" or "all", which is the default. Using "none" will consider the submodule modified when it either contains untracked or modified files or its HEAD differs from the commit recorded in the superproject and can be used to override any settings of the |