From: Junio C Hamano <gitster@pobox.com>
To: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
Cc: Git list <git@vger.kernel.org>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>,
Remi Lespinet <remi.lespinet@ensimag.grenoble-inp.fr>,
Guillaume Pages <guillaume.pages@ensimag.grenoble-inp.fr>,
Louis-Alexandre Stuber
<louis--alexandre.stuber@ensimag.grenoble-inp.fr>,
Antoine Delaite <antoine.delaite@ensimag.grenoble-inp.fr>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Philip Oakley <philipoakley@iee.org>
Subject: Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit
Date: Fri, 29 May 2015 08:36:14 -0700 [thread overview]
Message-ID: <xmqqwpzre6q9.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1416141686.132444.1432888411621.JavaMail.zimbra@ensimag.grenoble-inp.fr> (Remi Galan Alfonso's message of "Fri, 29 May 2015 10:33:31 +0200 (CEST)")
Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>
writes:
> 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.
next prev parent reply other threads:[~2015-05-29 15:36 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20150529082650.055A4487BA@zm-smtpout-1.grenet.fr>
[not found] ` <1836557143.132299.1432888016868.JavaMail.zimbra@ensimag.grenoble-inp.fr>
2015-05-29 8:33 ` [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit Remi Galan Alfonso
2015-05-29 15:36 ` Junio C Hamano [this message]
2015-05-26 21:38 Galan Rémi
2015-05-26 22:52 ` Eric Sunshine
2015-05-27 6:28 ` Johannes Schindelin
2015-05-27 14:53 ` Remi Galan Alfonso
2015-05-27 15:04 ` Matthieu Moy
2015-05-27 19:21 ` Junio C Hamano
2015-05-27 19:44 ` Matthieu Moy
2015-05-27 20:35 ` Junio C Hamano
2015-05-27 21:47 ` Stefan Beller
2015-05-28 17:06 ` Johannes Schindelin
2015-05-28 17:12 ` Stefan Beller
2015-05-28 17:45 ` Matthieu Moy
2015-05-27 23:42 ` Philip Oakley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqwpzre6q9.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=johannes.schindelin@gmx.de \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=philipoakley@iee.org \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.