Skip to content

Commit 55f657e

Browse files
committed
Merge branch 'ss/submodule-summary-in-c' into seen
Yet another subcommand of "git submodule" is getting rewritten in C. * ss/submodule-summary-in-c: submodule: port submodule subcommand 'summary' from shell to C t7421: introduce a test script for verifying 'summary' output submodule: rename helper functions to avoid ambiguity submodule: remove extra line feeds between callback struct and macro submodule: expose the '--for-status' option of summary
2 parents cfb0f37 + 4e5b4c0 commit 55f657e

File tree

8 files changed

+524
-200
lines changed

8 files changed

+524
-200
lines changed

Documentation/git-submodule.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ set-url [--] <path> <newurl>::
190190
automatically synchronize the submodule's new remote URL
191191
configuration.
192192

193-
summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]::
193+
summary [--cached|--files] [--for-status] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]::
194194
Show commit summary between the given commit (defaults to HEAD) and
195195
working tree/index. For a submodule in question, a series of commits
196196
in the submodule between the given super project commit and the
@@ -309,6 +309,12 @@ OPTIONS
309309
compares the commit in the index with that in the submodule HEAD
310310
when this option is used.
311311

312+
--for-status::
313+
This option is only valid for the summary command. This command
314+
skips the submodules with `submodule.<name>.ignore` set to `all`
315+
in the `.gitmodules` or `.git/config`. The configuration in
316+
`.git/config` overrides the configuration in `.gitmodules`.
317+
312318
-n::
313319
--summary-limit::
314320
This option is only valid for the summary command.

0 commit comments

Comments
 (0)