Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- here is what i do, since i learned not to re-upload new but make a new patchset: using CMParts as an example
- start on gingerbread branch
- git checkout -b mytestbranch
- change stuff, as many commits as you want, and then commit them
- git checkout -b mytestbranchrebased
- git rebase -i gingerbread
- on the commit msg screen (nano) leave the 1st "pick" alone, but change all the follwing to "squash"
- you will now have all your changes in 1 nice tidy commit
- checkout back to gingerbread branch and cd to the top of the tree (android/system/)
- repo start newbranch packages/apps/CMParts/
- cd packages/apps/CMParts.... (you will be on the new branch you just made)
- git cherry-pick <your rebased commit>
- repo upload packages/apps/CMParts
- done
- now, to add patchsets, go to that branch, make changes
- git add .
- git commit --amend *do not change the Change id or blank line below it!!!*
- cd ~/android/system
- repo upload packages/apps/CMParts
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement