[coreboot] git help: I can't get my whitespace cleanup in!

[Marc Jones]

Hi Keith,

On Mon, Aug 1, 2011 at 12:41 AM, Keith Hui <buurin at gmail.com> wrote:
> I'm trying to get this back in after we switched to git:
>
> http://review.coreboot.org/122
>
> All seems good except some whitespace fixes. Making the fix is easy,
> submitting it through git is where I need help.
>
> Problem is I can't seem to get correct the sequence of commands. Right
> now I would...
>
> git clone...
> make gitconfig
> Do the cleanup
> git add the files
> git commit
> git rebase -i master
> git push origin
>
> and now I don't know if I have done it right. At one time gerrit
> rejected my submit, on next try the second submitted is identical to
> the first. Another problem is a few other commits gets merged into
> master in the meantime and it wants me to merge them in my local
> before accepting my push, which is making me feel lost.
>
> At this point should i expect an incremental commit with the original,
> submitted commit being the parent? How do I make sure gerrit know this
> is for the same Change-Id?
>
> I'll admit before this I have never used git, and yes, I have read the
> few sites about this.
>
> Thanks for your help.
>

An incremental commit on the same change ID needs to have the entire
commit you want to make. You can't have two commits with one
change-id. What you want to do is edit your commit, rebase -i, and
edit the commit. You best option for getting more help is in
#coreboot.

Marc



-- 
http://se-eng.com