]> git.ipfire.org Git - thirdparty/git.git/commit
rebase -i: mark commits that begin empty in todo editor
authorElijah Newren <newren@gmail.com>
Sat, 11 Apr 2020 02:44:24 +0000 (02:44 +0000)
committerJunio C Hamano <gitster@pobox.com>
Sat, 11 Apr 2020 21:15:49 +0000 (14:15 -0700)
commit1b5735f75c7fd5a46a86adce35d1ed0c6e00ee0f
treefcec9e9ab8c5e97c2f06ef52525546ba6b1fb2f3
parent274b9cc25322d9ee79aa8e6d4e86f0ffe5ced925
rebase -i: mark commits that begin empty in todo editor

While many users who intentionally create empty commits do not want them
thrown away by a rebase, there are third-party tools that generate empty
commits that a user might not want.  In the past, users have used rebase
to get rid of such commits (a side-effect of the fact that the --apply
backend is not currently capable of keeping them).  While such users
could fire up an interactive rebase and just remove the lines
corresponding to empty commits, that might be difficult if the
third-party tool generates many of them.  Simplify this task for users
by marking such lines with a suffix of " # empty" in the todo list.

Suggested-by: Sami Boukortt <sami@boukortt.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt
sequencer.c