Nicolas Sebrecht wrote:
> The 20/01/11, Jonathan Nieder wrote:
>
> > if you
> > have a single "noop" instruction, that means "I have discarded all the
> > commits, but please rebase anyway".
>
> Ok, I think I get it now. What about adding
>
> Use "noop" with no other instruction to fallback to a non-interactive
> rebase. If other instructions are present, "noop" has no effect.
>
> ?
No, that's quite wrong.
The TODO list is the list of all commits that need to be rebased. It
does not contain commits that (according to patch-id) are already
contained in the upstream (i.e., the base you are rebasing on). If
the list is empty after filtering out such commits, rebase puts 'noop'
as the only command since "empty TODO" is already taken to mean
"abort"
If you then accept this 'noop' rebase, this effectively makes the
rebased branch the same as the base branch, sort of like resetting.
(I for one have never accepted such a rebase; if the TODO only
consists of noop, that means I made a mistake.)
--
Thomas Rast
trast@{inf,student}.ethz.ch
--
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