On 29/01/2011 15:31, Petr Štetiar wrote:
Marek Sujak<[email protected]> [2011-01-29 08:34:45]:
I have a question about these commits. Should i reset git to default state
(or clone it again) and then commit new files? Or make commit that will
firstly remove these files and them upload them in correct order (firstly
raw support, then architecture depended patch)?
If I understand your question correctly, than you don't need to clone/reset
anything at all. You should just learn git-rebase or maybe just the
git-cherry-pick for the beginning:
$ git checkout -b oe-upstream origin/master
$ git cherry-pick -n<hash of '[PATCH v2] barebox: added recipe for barebox v
2010.10'>
$ vim barebox-recipe # remove the vmx25 bits from the recipe
$ git add barebox-recipe&& git commit -a -m 'barebox: added barebox 2010.10'
$ git cherry-pick -n<hash of 'barebox: patches for barebox 2010.10 to support
vmx25'>
$ vim barebox-recipe # add vmx25 bits and vmx25 patch
$ git add barebox-recipe barebox-vmx25-patch
$ git commit -a -m 'barebox: add support for vmx25 machine'
$ #test-build the changes now
$ #git format v3 of your patchset
$ #review the patches
$ #git send the patches
BTW, it's really a lot easier and faster with git-rebase, it's worth learning
it.
yes, for "git rebase --interactive"
look : http://book.git-scm.com/4_interactive_rebasing.html
that will let you edit/amend your commits or squash them together or reorder
them easily
Eric
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
