From: Junio C Hamano Date: Wed, 29 May 2013 22:21:47 +0000 (-0700) Subject: Sync with maint X-Git-Tag: v1.8.4-rc0~244 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/727a46b2f9a1ce69eaf09bc46cb129f1c40833d8?hp=54219a4d89bac94c98f19f4eb5d1e18eb9499232 Sync with maint Signed-off-by: Junio C Hamano --- 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[=]:: Ignore changes to submodules in the diff generation. 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