undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pb/submodule-doc-fix'

Browse Source 
Doc update.

* pb/submodule-doc-fix:
  gitsubmodules doc: invoke 'ls-files' with '--recurse-submodules'
This commit is contained in:
Junio C Hamano 2020-10-05 14:01:55 -07:00
commit 9d19e1773c
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Documentation/gitsubmodules.txt
View File

@ -225,10 +225,10 @@ presence of the .url field.
Workflow for a third party library Workflow for a third party library
---------------------------------- ----------------------------------
# add a submodule # Add a submodule
git submodule add <url> <path> git submodule add <url> <path>
# occasionally update the submodule to a new version: # Occasionally update the submodule to a new version:
git -C <path> checkout <new version> git -C <path> checkout <new version>
git add <path> git add <path>
git commit -m "update submodule to new version" git commit -m "update submodule to new version"
@ -246,20 +246,23 @@ Workflow for an artificially split repo
# regular commands recurse into submodules by default # regular commands recurse into submodules by default
git config --global submodule.recurse true git config --global submodule.recurse true
# Unlike the other commands below clone still needs # Unlike most other commands below, clone still needs
# its own recurse flag: # its own recurse flag:
git clone --recurse <URL> <directory> git clone --recurse <URL> <directory>
cd <directory> cd <directory>
# Get to know the code: # Get to know the code:
git grep foo git grep foo
git ls-files git ls-files --recurse-submodules
[NOTE]
`git ls-files` also requires its own `--recurse-submodules` flag.
# Get new code # Get new code
git fetch git fetch
git pull --rebase git pull --rebase
# change worktree # Change worktree
git checkout git checkout
git reset git reset
@ -267,12 +270,12 @@ Implementation details
---------------------- ----------------------
When cloning or pulling a repository containing submodules the submodules When cloning or pulling a repository containing submodules the submodules
will not be checked out by default; You can instruct 'clone' to recurse will not be checked out by default; you can instruct `clone` to recurse
into submodules. The 'init' and 'update' subcommands of 'git submodule' into submodules. The `init` and `update` subcommands of `git submodule`
will maintain submodules checked out and at an appropriate revision in will maintain submodules checked out and at an appropriate revision in
your working tree. Alternatively you can set 'submodule.recurse' to have your working tree. Alternatively you can set `submodule.recurse` to have
'checkout' recursing into submodules (note that 'submodule.recurse' also `checkout` recursing into submodules (note that `submodule.recurse` also
affects other git commands, see linkgit:git-config[1] for a complete list). affects other Git commands, see linkgit:git-config[1] for a complete list).
SEE ALSO SEE ALSO