Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Document waf tools for submodule, disable recursion #5731

Closed
wants to merge 1 commit into from
Closed

Document waf tools for submodule, disable recursion #5731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions dev/source/docs/git-rebase.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ the "Git Shell" or "Git Bash" utility that should already be :ref:`installed <gi

git remote add upstream https://github.com/ArduPilot/ardupilot.git

#. Ensure that your git config for ArduPilot does not automatically recurse through submodules

::
git config submodule.recurse false

#. Fetch changes from the upstream repository (this simply downloads changes into a local cache, it will not overwrite or modify your changes in any way).
If you are rebasing your branch on your own fork's master branch, replace upstream with origin

Expand Down
6 changes: 3 additions & 3 deletions dev/source/docs/git-submodules.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ Disaster recovery

If things have gone very badly wrong with your git tree the simplest
thing to do it to remove the modules/ directory completely from your local repo and run these commands
to reinitialise and update the submodules:
to delete and reinitialise and update the submodules:

::

git submodule init
git submodule update --recursive
./waf submodule_force_clean
./waf submodule_sync