Rebase
From Open-FCoE Wiki
[edit] Introduction
Occasionally we have to rebase the open-fcoe-upstream repository. We need to do it for two reasons, 1) If the SCSI tree we're based on rebases and 2) We need to pull new code down from the SCSI tree. This page documents the procedure we're using to rebase our repository. Anyone basing a git tree on our open-fcoe-upstream repository should do something similar when they notice we've rebased.
[edit] Motivation
We're trying hard to keep our patches at the top of our tree. We're doing this for a few reasons,
- Helps us see our changes- If we didn't every time we pulled from SCSI our patches would fall down into the history.
- Upstream merge - When we merge with an upstream kernel we'll have the option to merge a large patch of all of our changes or just apply our top patches individually which will allow engineers to get credit for their work and will help with bisecting/debugging an issue that a single patch introduced.
[edit] Procedure
git clone git://open-fcoe.org/openfc/open-fcoe-initiator.git cd open-fcoe-upstream git remote add -f scsi git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6.git git checkout -b scsi scsi/master git checkout master git rebase scsi