]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: bb2ac4f) | patch
rebase -i --keep-empty: don't prune empty commits
authorPhillip Wood <phillip.wood@dunelm.org.uk>
Tue, 20 Mar 2018 10:03:14 +0000 (10:03 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 29 Mar 2018 17:46:48 +0000 (10:46 -0700)
commit76ea235891c08e43226391cceaca8be056a1f803
tree96b2209eb6d010dc8c3bdca2cc6c85f9e67027e2tree | snapshot
parentbb2ac4fcacaf5044b44e2acb918da33a4cca6af1commit | diff
rebase -i --keep-empty: don't prune empty commits

If there are empty commits on the left hand side of $upstream...HEAD
then the empty commits on the right hand side that we want to keep are
pruned by --cherry-pick. Fix this by using --cherry-mark instead of
--cherry-pick and keeping the commits that are empty or are not marked
as cherry-picks.

Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c diff | blob | history
t/t3421-rebase-topology-linear.sh diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.