On Wednesday 27 May 2009 12:07:29 Denys Vlasenko wrote: > commit: > http://git.busybox.net/busybox/commit/?id=e6f6d829403156797fabc4690d497fdf7 >cd6f7d1 branch: > http://git.busybox.net/busybox/commit/?id=refs/heads/1_14_stable
you dont need to copy the files/changes manually. git provides a very easy way to move changesets between branches: cherry-pick. this retains all the commit information automatically. so i just put the depmod.pl fix on the 1.14 branch by doing: # check out the branch $ git checkout -b 1_14_stable origin/1_14_stable Branch 1_14_stable set up to track remote branch 1_14_stable from origin. Switched to a new branch '1_14_stable' # grab the fix from master $ git cherry-pick 2b6497ba84a3c612738a5939c142e33480e8e0f6 Finished one cherry-pick. [1_14_stable 77508d7] depmod.pl: updates and fixes galore 1 files changed, 56 insertions(+), 9 deletions(-) # push the updated branch $ git push -mike
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ busybox mailing list [email protected] http://lists.busybox.net/mailman/listinfo/busybox
