checkout -m: recreate merge when checking out of unmerged index

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 13234fa280b279bfccad0a9aec6989727957567a..cba90fd27c6a1baaca884328e96adc8a6da8fc36 100644 (file)
--- 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/".
 
@@ -238,4 +241,4 @@ endif::git-format-patch[]
        Do not show any source or destination prefix.
 
 For more detailed explanation on these common options, see also
-link:diffcore.html[diffcore documentation].
+linkgit:gitdiffcore[7].