Sverre Rabbelier <srabbelier@xxxxxxxxx> writes:
> Say I have a bunch of new commits ready to submit to origin, but I want to fix
> some whitespace damage, I could do something like this:
>
> $ git checkout master
> $ git branch -b rebase-me
> $ git reset --hard origin/master
> $ git commit --allow-empty "force rebase"
> $ git checkout rebase-me
> $ git rebase --whitespace=fix master
> $ git rebase -i master # kick out the 'force rebase' commit
> $ git checkout master
> $ git reset --hard rebase-me
> $ git branch -d rebase-me
For that, I would prefer to see:
git format-patch --stdout origin >my.mbox
git fetch origin
git checkout origin ;# yes, detach
git am --whitespace=fix my.mbox
make test
git format-patch -o to-send-out origin
git send-email ..options.. to-send-out
for two reasons.
It fixes whitespace breakages, but more importantly, the procedure makes
sure that what you will be sending out will apply cleanly to the origin
that may have progressed since you last looked at it.
--
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
