git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 18a6a85 3d94616)
Merge branch 'pw/rebase-keep-empty-fixes'
authorJunio C Hamano <redacted>
Wed, 25 Apr 2018 04:28:49 +0000 (13:28 +0900)
committerJunio C Hamano <redacted>
Wed, 25 Apr 2018 04:28:49 +0000 (13:28 +0900)
commitd892beef52a293b271538481dbc76014672ddf09
treee9f7896908c60aff2a25a6fe4ac327aaaa6d6974tree | snapshot
parent18a6a8571fa150441de06e007e9c61856bfadc5dcommit | diff
parent3d946165e1177905103a25aeb374e018c510e540commit | diff
Merge branch 'pw/rebase-keep-empty-fixes'

"git rebase --keep-empty" still removed an empty commit if the
other side contained an empty commit (due to the "does an
equivalent patch exist already?" check), which has been corrected.

* pw/rebase-keep-empty-fixes:
  rebase: respect --no-keep-empty
  rebase -i --keep-empty: don't prune empty commits
  rebase --root: stop assuming squash_onto is unset
git-rebase.sh diff1 | diff2 | blob | history
sequencer.c diff1 | diff2 | blob | history
git clone https://git.99rst.org/PROJECT