Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
G
git-repo
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux-tools
git-repo
Commits
f9270f2f
Commit
f9270f2f
authored
Jul 01, 2016
by
Matthias Putz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added: Commands in README for resyncing with official git-repo version
parent
58ca062a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
0 deletions
+27
-0
README.md
README.md
+27
-0
No files found.
README.md
View file @
f9270f2f
...
...
@@ -69,6 +69,7 @@ The editrights tools is provided as part of git-repo for Microsoft Windows.
$ curl https://raw.githubusercontent.com/esrlabs/git-repo/stable/repo > ~/bin/repo
$ chmod a+x ~/bin/repo
### Usage ###
For more detailed instructions regarding git-repo usage, please visit
[
git-repo
](
http://source.android.com/source/using-repo.html
)
.
...
...
@@ -105,3 +106,29 @@ you have to add `gpg.exe` to your PATH variable. The executable can be found in
*
Added push.py sub command to upload and bypass the code review system.
*
Added interactive workflow test
### Developer Information ###
##### Resyncing with official google repo #####
For resyncing with the official google repo git, here are the commands for resyncing with the tag v1.12.33 of the official google repo:
# add google git-repo remote with tag
git remote add googlesource https://android.googlesource.com/tools/repo/
git checkout v1.12.33 -b google-latest
# checkout basis for resync
git checkout google-git-repo-base -b update
git merge --allow-unrelated-histories -Xtheirs --squash google-latest
git commit -m "Update: google git-repo v1.12.33"
git rebase stable
# solve conflicts; keep portability in mind
git checkout stable
git rebase update
# cleanup
git branch -D update
git branch -D google-latest
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment