diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-04-28 15:50:01 -0700 |
| commit | cc908dbc76adea39b2756c1091016e929c66689d (patch) | |
| tree | e5f6b26d135a41a8721ad91ee06252e29e9e7bdd /Documentation/git-reset.txt | |
| parent | Merge branch 'jc/log-no-mailmap' (diff) | |
| parent | doc: --recurse-submodules mostly applies to active submodules (diff) | |
| download | tgif-cc908dbc76adea39b2756c1091016e929c66689d.tar.xz | |
Merge branch 'dr/doc-recurse-submodules'
Documentation updates around the "--recurse-submodules" option.
* dr/doc-recurse-submodules:
doc: --recurse-submodules mostly applies to active submodules
doc: be more precise on (fetch|push).recurseSubmodules
doc: explain how to deactivate submodule.recurse completely
doc: document --recurse-submodules for reset and restore
doc: list all commands affected by submodule.recurse
Diffstat (limited to 'Documentation/git-reset.txt')
| -rw-r--r-- | Documentation/git-reset.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 932080c55d..252e2d4e47 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -87,6 +87,12 @@ but carries forward unmerged index entries. different between `<commit>` and `HEAD`. If a file that is different between `<commit>` and `HEAD` has local changes, reset is aborted. + +--[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 + the submodules' HEAD to be detached at that commit. -- See "Reset, restore and revert" in linkgit:git[1] for the differences |