On Mon, Sep 8, 2014 at 4:51 AM, Anders Oleson <[email protected]> wrote:
>
> Can someone point me at some method in GIT that I can rewrite the commits
> to separate them and so I can push to gerrit? Also, for the SPI fix #1 what
> would a decent/acceptable commit? message be?
>
Apparently you found a way to do it! Thanks, and the commit message's fine.
I prefer to split commits via "git gui". Just select "Amend Last Commit"
and unstage the changes you don't want in the first commit. In git gui,
this is easy to do file-by-file, hunk-by-hunk or even line-by-line. That's
a bit more involved on the command line. When you're happy, recommit and
stage the changes you want for the next commit.
If the patch you want to split is not your current HEAD, first do an
interactive rebase (git rebase -i origin/master) and select to stop for
amending on the commit. Then "git rebase --continue" when you're done with
the split.
/Andreas
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
OpenOCD-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openocd-devel
