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. $ git rebase --onto HEAD v2.6.27-omap1 custom First, rewinding head to replay your work on top of it... Applying x86, ptrace: PEBS support error: patch failed: arch/x86/Kconfig.cpu:415 error: arch/x86/Kconfig.cpu: patch does not apply error: patch failed: arch/x86/kernel/cpu/intel.c:222 error: arch/x86/kernel/cpu/intel.c: patch does not apply error: patch failed: arch/x86/kernel/ds.c:2 error: arch/x86/kernel/ds.c: patch does not apply error: patch failed: arch/x86/kernel/process_32.c:316 error: arch/x86/kernel/process_32.c: patch does not apply error: patch failed: arch/x86/kernel/process_64.c:267 error: arch/x86/kernel/process_64.c: patch does not apply error: patch failed: arch/x86/kernel/ptrace.c:554 error: arch/x86/kernel/ptrace.c: patch does not apply error: arch/x86/kernel/setup_64.c: does not exist in index error: include/asm-x86/ds.h: does not exist in index error: include/asm-x86/processor.h: does not exist in index error: include/asm-x86/ptrace-abi.h: does not exist in index error: include/asm-x86/ptrace.h: does not exist in index Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merged arch/x86/Kconfig.cpu CONFLICT (content): Merge conflict in arch/x86/Kconfig.cpu Auto-merged arch/x86/kernel/cpu/intel.c CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/intel.c Auto-merged arch/x86/kernel/ds.c CONFLICT (content): Merge conflict in arch/x86/kernel/ds.c Auto-merged arch/x86/kernel/process_32.c CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c Auto-merged arch/x86/kernel/process_64.c CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c Auto-merged arch/x86/kernel/ptrace.c CONFLICT (content): Merge conflict in arch/x86/kernel/ptrace.c CONFLICT (delete/modify): arch/x86/kernel/setup_64.c deleted in HEAD and modified in x86, ptrace: PEBS support. Version x86, ptrace: PEBS support of arch/x86/kernel/setup_64.c left in tree. CONFLICT (delete/modify): include/asm-x86/ds.h deleted in HEAD and modified in x86, ptrace: PEBS support. Version x86, ptrace: PEBS support of include/asm-x86/ds.h left in tree. Failed to merge in the changes. Patch failed at 0001. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". Thanks.
Attachment:
signature.asc
Description: Digital signature
