Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit

From: Junio C Hamano <gitster@pobox.com>
Date: May 29, 2015, 15:36 UTC
Message-ID: <xmqqwpzre6q9.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1416141686.132444.1432888411621.JavaMail.zimbra@ensimag.grenoble-inp.fr>

Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr> writes:

Show 7 quoted lines

> At first we wanted a clear indication about removing a commit in
> rebase -i. We didn't know about the noop command.
>  - 'noop' does the same thing as 'drop' but for the user deleting a
>    commit through 'noop' doesn't seem to be the proper way to use this
>    command. Moreover 'noop' is not documented (especially it is not
>    shown in the short help that is display in the editor during the
>    rebase -i)

As Matthieu said elsewhere during the discussion, 'noop' is merely to ignore everything that follows (so 'noop stupid git' does not mean "ignore commit identified by 'stupid git'") and the only reason why it exists is as a hack to have a way to make a non-empty todo list, because an empty todo list means "do not do anything, not even rewinding to the onto commit".

As such, I actually think it is a mistake to consider 'noop' as "drop _this_ commit"; the remainder of the line that begins with 'noop' does not name any commit.