From: Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
To: Junio C Hamano <gitster@pobox.com>
Cc: Remi Galan Alfonso <remi.galan-alfonso@ensimag.grenoble-inp.fr>,
Johannes Schindelin <johannes.schindelin@gmx.de>,
git@vger.kernel.org,
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>
Subject: Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit
Date: Wed, 27 May 2015 21:44:34 +0200 [thread overview]
Message-ID: <vpq8uc9yfdp.fsf@anie.imag.fr> (raw)
In-Reply-To: <xmqqsiahltbu.fsf@gitster.dls.corp.google.com> (Junio C. Hamano's message of "Wed, 27 May 2015 12:21:41 -0700")
Junio C Hamano <gitster@pobox.com> writes:
> Matthieu Moy <Matthieu.Moy@grenoble-inp.fr> writes:
>
>> I find it weird to write
>>
>> noop <sha1> <title>
>
> True, but then it can be spelled
>
> # <sha1> <title>
I do find it weird too. "#" means "comment", which means "do as if it
was not there" to me. And in this case it does change the semantics once
you activate the safety feature: error out without the "# <sha1>
<title>", rebase dropping the commit if the comment is present.
--
Matthieu Moy
http://www-verimag.imag.fr/~moy/
next prev parent reply other threads:[~2015-05-27 19:44 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-26 21:38 [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit Galan Rémi
2015-05-26 21:38 ` [PATCH/RFC 2/2] git rebase -i: Warn removed or dupplicated commits Galan Rémi
2015-05-26 23:27 ` Eric Sunshine
2015-05-27 13:19 ` Remi Galan Alfonso
2015-05-27 17:41 ` Eric Sunshine
2015-05-27 19:18 ` Junio C Hamano
2015-05-28 7:44 ` Remi Galan Alfonso
2015-05-28 16:53 ` Junio C Hamano
2015-05-27 13:23 ` Remi Galan Alfonso
2015-05-27 8:54 ` Stephen Kelly
2015-05-27 11:38 ` Matthieu Moy
2015-05-27 19:20 ` Junio C Hamano
2015-05-26 22:52 ` [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit 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 [this message]
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
[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 ` Remi Galan Alfonso
2015-05-29 15:36 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=vpq8uc9yfdp.fsf@anie.imag.fr \
--to=matthieu.moy@grenoble-inp.fr \
--cc=antoine.delaite@ensimag.grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=guillaume.pages@ensimag.grenoble-inp.fr \
--cc=johannes.schindelin@gmx.de \
--cc=louis--alexandre.stuber@ensimag.grenoble-inp.fr \
--cc=remi.galan-alfonso@ensimag.grenoble-inp.fr \
--cc=remi.lespinet@ensimag.grenoble-inp.fr \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).