On Sun, Feb 24 2008 at 13:48 +0200, Ke Wei <kewei.mv@xxxxxxxxx> wrote:
> On Sat, Feb 23, 2008 at 11:28:50AM -0500, Jeff Garzik wrote:
>> Ke Wei wrote:
>>> Convert rough draft Marvell 6440 driver to a working driver.
>>> Added support for SAS and SATA devices, hotplug, wide port, and expanders.
>>> This patch is based on:
>>> branch 'mvsas' of
>>> git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git
>> Yay! Perfect patch: good tech content, applyable to #mvsas, and the
>> most important part, the driver works :)
>>
>> One minor (though important) detail: may we assume this patch has the
>> same Signed-off-by as previous patches?
>>
>
> Oah, I have no idea how to diff between the previous 5th commit and
> current to use git-format-patch command, so I had to use git-diff to
> create patch. As a result, I format to place my Signed-off-by when
> sending email.
> Jeff, Do you have a good suggestion? Thank you for your help.
Do you mean you have 5 patches in git that you want to send as
one patch to the list?
- if so then lets say you are in branch my_branch based off master
and it has your 5 patches. And lets say you want to keep your
original 5 patch, but have an alternative one patch for them all.
- $ git-checkout -b my_one_patch my_branch
- $ git-rebase--interactive master
- At this stage you will get your $GIT_EDITOR with a list of your
5 patches like:
pick xxxxxxx patch one
pick yyyyyyy patch two
...
edit the "pick" at start of line to "squash" to all but the first
patch. Save and exit the editor.
- git will ask you to edit the commit message of the now combined patch,
in an editor, do so. Verify you have a Signed-off-by:, save and exit.
- Rebase should finish cleanly, leaving you with one patch that can then
be sent with $ git-format-patch -1.
- If you do $ git-diff my_one_patch my_branch
they are identical
- But $ git-log my_one_patch
will only have one patch following master
Any re-edits of your git history git-rebase--interactive is your
friend.
>
> Now,
> Signed-off-by: Ke Wei <kewei@xxxxxxxxxxx>
>
>> Thanks and have a good weekend,
>>
>> Jeff
>>
> -
Boaz
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
