Sync with maint

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano
2013-05-29 15:21:47 -07:00

View File

@ -480,7 +480,7 @@ endif::git-format-patch[]
--ignore-submodules[=<when>]:: --ignore-submodules[=<when>]::
Ignore changes to submodules in the diff generation. <when> can be 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 Using "none" will consider the submodule modified when it either contains
untracked or modified files or its HEAD differs from the commit recorded 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 in the superproject and can be used to override any settings of the