Google Git
Sign in
fuchsia/integration/5ddc47107ab003b67f6cd3a13235ee4f37d13997
commit
5ddc47107ab003b67f6cd3a13235ee4f37d13997
[log]
author
Haowei Wu <haowei@fuchsia.infra.roller.google.com>
Fri Mar 26 03:37:52 2021 +0000
committer
Copybara-Service <copybara-worker@google.com>
Thu Mar 25 20:38:42 2021 -0700
tree
a48fbbe31178b2fe430709d6409d04ef32515e1f
parent
1b73ddc571ab322e67c81bc9a80fbe18784a9568 [diff]
[roll] Roll infra/recipes [submodule] Add 'allow-unrelated-histories' when merge

This change adds 'allow-unrelated-histories' flag to git merge step
in submodule.py to address issues with codesearch super project.

Original-Bug: 70877
Original-Reviewed-on: https://fuchsia-review.googlesource.com/c/infra/recipes/+/507518
Original-Revision: 47da79592dd3e554ef4532022f3167e6f9ef4043
GitOrigin-RevId: 6e2654fa08c014e9330327e2adef9adc3f163366
Change-Id: I37fe5bf46e6338e83301d9d25f910a5ed8dc916b
1 file changed
tree: a48fbbe31178b2fe430709d6409d04ef32515e1f
  1. garnet/
  2. infra/
  3. peridot/
  4. third_party/
  5. topaz/
  6. zircon/
  7. firmware
  8. flower
  9. jiri.lock
  10. minimal
  11. prebuilts
  12. README.md
  13. stem
  14. test_durations
README.md

Integration

This repository contains Fuchsia's Global Integration manifest files.

Making changes

All changes should be made to the internal version of this repository. Our infrastructure automatically updates this version when the internal one changes.

Currently all changes must be made by a Google employee. Non-Google employees wishing to make a change can ask for assistance via the IRC channel #fuchsia on Freenode.

Obtaining the source

First install Jiri.

Next run:

$ jiri init
$ jiri import minimal https://fuchsia.googlesource.com/integration
$ jiri update

Third party

Third party projects should have their own subdirectory in ./third_party.