Re: [frogs] Patch for Issue #830

[Trevor Daniels]

Carl Sorensen wrote" <address@hidden>

> On 12/21/09 8:08 AM, "Trevor Daniels" <address@hidden> 
> wrote:
>
> > As far as I know it can't.  The rebase command rebases
> > one git branch on another, so you have to be using branches
> > to take advantage of it.

> Rebase combines all the changes between two different git commits 
> into a
> single patch.

This is not a true statement either ;)  Combining
commits into one or fewer is an option available
in the interactive version of rebase but normally
all commits are reapplied separately.

> For example, you can do
>
> git rebase -i HEAD^3
>
> so you can do
>
> git rebase --whitespace=fix HEAD^

Hhm.  I don't think this works.

The whitespace option is simply passed to apply
for actioning, but in this case apply is never
invoked as HEAD is already up to date.  But
please correct me if you find it does work, as
this would certainly be an easier option.

Trevor