On Thu, 27 Dec 2007, adr3nald0s@xxxxxxxxx wrote: > > On a clone of linux-2.6: > > git checkout -b topic/test v2.6.15 > touch drivers/a-file.c > git add drivers/a-file.c > git commit -m 'Add a file' > git checkout -b temp0 v2.6.16 > git rebase topic/test This will rebase temp0 (= v2.6.16) onto topic/test. This process linearizes the history being rebased, and conflicts in that history (that were resolved in the merges) show up when the second change to those lines gets introduced. What you probably want is ... git commit -m 'Add a file' git checkout -b temp0 git rebase v2.6.16 -Daniel *This .sig left intentionally blank* - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
