Hi! I tried doing:
git fetch ssh://axo...@openocd.zylin.com:29418/openocd refs/changes/34/534/4 && git checkout FETCH_HEAD git pull ssh://axo...@openocd.zylin.com:29418/openocd refs/changes/69/669/1 (make changes) git add ... git commit tools/checkpatch.sh However I can't push to the gerrit: akos@FM12BQ:~/projects/c/openocd$ git push review Counting objects: 22, done. Delta compression using up to 8 threads. Compressing objects: 100% (10/10), done. Writing objects: 100% (10/10), 2.08 KiB, done. Total 10 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) To ssh://axo...@openocd.zylin.com:29418/openocd.git ! [remote rejected] HEAD -> refs/publish/master (you are not allowed to upload merges) error: failed to push some refs to 'ssh://axo...@openocd.zylin.com:29418/openocd.git' Regards, Ákos Vandra Regards, Ákos On 25 May 2012 14:01, Spencer Oliver <s...@spen-soft.co.uk> wrote: > On 25 May 2012 12:35, Akos Vandra <axo...@gmail.com> wrote: >> Hi! >> >> Question in brief: How do I make a commit depend on two other ones? >> >> I've update a few patches over the current master head that have not >> yet been integrated. From now on I'll need to work with Andreas' mpsse >> driver patches which also have not yet been integrated. >> > > checkout the last patch in Andreas series, eg. > git fetch ssh://usern...@openocd.zylin.com:29418/openocd > refs/changes/34/534/4 && git checkout FETCH_HEAD > > this will be in a detached state, so create a dev branch > git checkout -b branchname > > then apply your patches on top as normal > > then when you are ready to push your changes to gerrit > git push review > > Spen ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ OpenOCD-devel mailing list OpenOCD-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openocd-devel
