From: Johannes Schindelin Date: Wed, 27 May 2015 06:28:42 GMT Subject: Re: [PATCH/RFC 1/2] git-rebase -i: Add key word "drop" to remove a commit Message-ID: In-Reply-To: <1432676318-22852-1-git-send-email-remi.galan-alfonso@ensimag.grenoble-inp.fr> Hi Rémi, On 2015-05-26 23:38, Galan Rémi wrote: > Instead of removing a line to remove the commit, you can use the key > word "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. Please note that you can already just comment-out the line if you need to keep a visual trace. Alternatively, you can replace the `pick` command by `noop`. If you really need the `drop` command (with which I am not 100% happy because I already envisage users appending a `drop A` to an edit script "pick A; pick B; pick C" and expecting A *not to be picked*), then it is better to just add the `drop` part to the already existing `noop` clause: diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index f7deeb0..8355be8 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -489,7 +489,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) mark_action_done ;; pick|p) Ciao, Johannes