diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-08-25 14:22:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-08-25 14:22:02 -0700 |
| commit | 0d8f4ccfe3b13bb5eb95f030dc5fe76efb255397 (patch) | |
| tree | d7c7205b2ae9788e006996be6f8074978f215507 /Documentation/git-reset.adoc | |
| parent | 109c3df14ccf372c2438a470bdfb566265399f0a (diff) | |
| parent | 84f3d6e11e085a52e561a509f2433208f22c6d3b (diff) | |
| download | git-0d8f4ccfe3b13bb5eb95f030dc5fe76efb255397.tar.xz | |
Merge branch 'ja/doc-lint-sections-and-synopsis'
Doc lint updates to encourage the newer and easier-to-use
`synopsis` format, with fixes to a handful of existing uses.
* ja/doc-lint-sections-and-synopsis:
doc lint: check that synopsis manpages have synopsis inlines
doc:git-for-each-ref: fix styling and typos
doc: check for absence of the form --[no-]parameter
doc: check for absence of multiple terms in each entry of desc list
doc: check well-formedness of delimited sections
doc: test linkgit macros for well-formedness
Diffstat (limited to 'Documentation/git-reset.adoc')
| -rw-r--r-- | Documentation/git-reset.adoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-reset.adoc b/Documentation/git-reset.adoc index 50e8a0ba6f..3b9ba9aee9 100644 --- a/Documentation/git-reset.adoc +++ b/Documentation/git-reset.adoc @@ -90,7 +90,8 @@ but carries forward unmerged index entries. If a file that is different between _<commit>_ and `HEAD` has local changes, reset is aborted. -`--[no-]recurse-submodules`:: +`--recurse-submodules`:: +`--no-recurse-submodules`:: When the working tree is updated, using `--recurse-submodules` will also recursively reset the working tree of all active submodules according to the commit recorded in the superproject, also setting |