On Wed, Dec 24, 2008 at 06:46:31PM -0600, green wrote:
> On Wed, 2008.12.24, 359, Felipe Balbi wrote:
> > On Tue, Dec 23, 2008 at 09:24:19PM -0600, green wrote:
> > > I have cloned linux-omap-2.6 and created a local branch. In the local
> > > branch I
> > > have made one very simple commit with a single line change to Makefile
> > > for use
> > > when cross-compiling (arm-linux-gnueabi-). I would like to be able to
> > > rebase
> > > that branch (just the 1 commit) onto any commit in the master branch so
> > > that I
> > > can test N810 builds using git-bisect without modifying the Makefile
> > > every
> > > time. I can easily move the branch forward to the latest commit with
> > > 'git
> > > rebase master' (with the local branch active) but something like 'git
> > > rebase
> > > v2.6.27-omap1' returns merge errors. Of course that 1 commit will apply
> > > easily
> > > to that specific tree.
> >
> > hmmm, something like git rebase --onto HEAD v2.6.27-omap1 <your_branch>
> > should work.
>
> I got a bunch of merge conflicts this way.
maybe I got the parameters wrong. git help rebase will have the correct
answer. But there are two other easier ways to do it:
a. with git cherry-pick:
$ git checkout -b newbranch v2.6.27-omap1
$ git cherry-pick <commit id for your Makefile change>
b. symlink: just create a symbolic link from arm-none-linux-gnueabi-* to
arm-linux-*, something like:
$ cd /path/to/compiler
$ for i in `ls`; do ln -s $i ${i/none-linux-gnueabi/linux}; done
this might help. To be sure the command is right before really executing
it, change ln -s to echo and see if the paths are ok.
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
