Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

add command for updating third_party #893

Merged
merged 3 commits into from
Dec 14, 2018
Merged

add command for updating third_party #893

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d3dede
add command for updating `third_party`
cvan Dec 14, 2018
80b2dd4
fix URL in README for `third_party`
cvan Dec 14, 2018
6c5d28e
tweak git command for `third_party` (per @bluemarvin's feedback)
cvan Dec 14, 2018
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 README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ This repo is only available to Mozilla employees. If you have access to the rele
- `third_party/svr/` for Snapdragon (should contain a `libs` folder, among other things)
- `third_party/wavesdk/` for Vive (should contain a `build` folder, among other things)

The [repo in `third_party`](https://github.com/MozillaReality/FirefoxReality-android-third-party) can be updated like so:

```bash
pushd third_party && git checkout master && git pull && popd
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pushd third_party && git fetch && git rebase origin/master && popd

Is how I would do it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like your suggestion better. changed.

I use git pull which does git pull --rebase because I have rebase = true in my ~/.gitconfig:

[branch "master"]
	remote = origin
	merge = refs/heads/master
	rebase = true

```

*Fetch Git submodules.*

Expand Down