git-rebase -i: add command "drop" to remove a commit

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Galan Rémi
2015-06-29 22:20:30 +02:00
committed by Junio C Hamano
parent 77bd3ea9f5
commit c9266d5894
4 changed files with 25 additions and 3 deletions

View File

@ -152,6 +152,7 @@ Commands:
s, squash = use commit, but meld into previous commit
f, fixup = like "squash", but discard this commit's log message
x, exec = run command (the rest of the line) using shell
d, drop = remove commit
These lines can be re-ordered; they are executed from top to bottom.
@ -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)