using git with linux-omap

[green <greenfreedom10@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 820 bytes --]

Hey, I am trying to figure out git and am having trouble with something that 
ought to be simple.

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.

Is this possible?  What am I missing?  Thanks lots!

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]