File tree Expand file tree Collapse file tree 1 file changed +27
-0
lines changed Expand file tree Collapse file tree 1 file changed +27
-0
lines changed Original file line number Diff line number Diff line change @@ -69,6 +69,7 @@ The editrights tools is provided as part of git-repo for Microsoft Windows.
6969 $ curl https://raw.githubusercontent.com/esrlabs/git-repo/stable/repo > ~/bin/repo
7070 $ chmod a+x ~/bin/repo
7171
72+
7273### Usage ###
7374
7475For 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
105106
106107* Added push.py sub command to upload and bypass the code review system.
107108* Added interactive workflow test
109+
110+
111+ ### Developer Information ###
112+
113+ ##### Resyncing with official google repo #####
114+
115+ 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:
116+
117+ # add google git-repo remote with tag
118+ git remote add googlesource https://android.googlesource.com/tools/repo/
119+ git checkout v1.12.33 -b google-latest
120+
121+ # checkout basis for resync
122+ git checkout google-git-repo-base -b update
123+ git merge --allow-unrelated-histories -Xtheirs --squash google-latest
124+ git commit -m "Update: google git-repo v1.12.33"
125+ git rebase stable
126+
127+ # solve conflicts; keep portability in mind
128+
129+ git checkout stable
130+ git rebase update
131+
132+ # cleanup
133+ git branch -D update
134+ git branch -D google-latest
You can’t perform that action at this time.
0 commit comments