From: Junio C Hamano <gitster@pobox•com>
To: "Galan Rémi" <remi.galan-alfonso@ensimag•grenoble-inp.fr>
Cc: Git List <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>,
Matthieu Moy <Matthieu.Moy@grenoble-inp•fr>,
Johannes Schindelin <johannes.schindelin@gmx•de>,
Stefan Beller <sbeller@google•com>,
Philip Oakley <philipoakley@iee•org>,
Eric Sunshine <sunshine@sunshineco•com>,
Stephen Kelly <steveire@gmail•com>
Subject: Re: [PATCH/RFCv2 1/2] git-rebase -i: add command "drop" to remove a commit
Date: Mon, 01 Jun 2015 09:39:53 -0700 [thread overview]
Message-ID: <xmqqvbf7757q.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1433152643-4292-2-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr> ("Galan Rémi"'s message of "Mon, 1 Jun 2015 11:57:22 +0200")
Galan Rémi <remi.galan-alfonso@ensimag•grenoble-inp.fr> writes:
> Instead of removing a line to remove the commit, you can use the
> command "drop" (just like "pick" or "edit"). It has the same effect as
> deleting the line (removing the commit) except that you keep a visual
> trace of your actions, allowing a better control and reducing the
> possibility of removing a commit by mistake.
>
> Signed-off-by: Galan Rémi <remi.galan-alfonso@ensimag•grenoble-inp.fr>
> ---
Matthieu, is this part of your class project?
I vaguely recall that your school wants your sign-off to release
patches to us or something like that, and that I saw some other
patches came with your sign-off, so I am being curious.
> @@ -505,7 +506,7 @@ do_next () {
> rm -f "$msg" "$author_script" "$amend" || exit
> read -r command sha1 rest < "$todo"
> case "$command" in
> - "$comment_char"*|''|noop)
> + "$comment_char"*|''|noop|drop|d)
> mark_action_done
> ;;
> pick|p)
Is this sufficient?
If you are going to do something in 2/2 that relies on the format of
this line being correct (as opposed to "noop" or "#" that can have
any garbage on the remainder of the line), wouldn't you want to at
least check $sha1 is sensible?
next prev parent reply other threads:[~2015-06-01 16:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 9:57 [PATCH/RFCv2 0/2] rebase -i : drop command and removed commits Galan Rémi
2015-06-01 9:57 ` [PATCH/RFCv2 1/2] git-rebase -i: add command "drop" to remove a commit Galan Rémi
2015-06-01 16:39 ` Junio C Hamano [this message]
2015-06-01 17:06 ` Matthieu Moy
2015-06-01 17:45 ` Remi Galan Alfonso
2015-06-01 18:36 ` Matthieu Moy
2015-06-02 7:23 ` Remi Galan Alfonso
2015-06-02 7:45 ` Matthieu Moy
2015-06-02 17:14 ` Junio C Hamano
2015-06-03 9:13 ` Remi Galan Alfonso
2015-06-03 17:52 ` Junio C Hamano
2015-06-01 9:57 ` [PATCH/RFCv2 2/2] git rebase -i: warn about removed commits Galan Rémi
-- strict thread matches above, loose matches on Subject: below --
2015-06-01 11:52 [PATCH/RFCv2 1/2] git-rebase -i: add command "drop" to remove a commit Galan Rémi
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=xmqqvbf7757q.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=Matthieu.Moy@grenoble-inp$(echo .)fr \
--cc=antoine.delaite@ensimag$(echo .)grenoble-inp.fr \
--cc=git@vger$(echo .)kernel.org \
--cc=guillaume.pages@ensimag$(echo .)grenoble-inp.fr \
--cc=johannes.schindelin@gmx$(echo .)de \
--cc=louis--alexandre.stuber@ensimag$(echo .)grenoble-inp.fr \
--cc=philipoakley@iee$(echo .)org \
--cc=remi.galan-alfonso@ensimag$(echo .)grenoble-inp.fr \
--cc=remi.lespinet@ensimag$(echo .)grenoble-inp.fr \
--cc=sbeller@google$(echo .)com \
--cc=steveire@gmail$(echo .)com \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox