| commit | d892beef52a293b271538481dbc76014672ddf09 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Apr 2018 04:28:49 +0000 (25 13:28 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 25 Apr 2018 04:28:49 +0000 (25 13:28 +0900) | ||
| tree | e9f7896908c60aff2a25a6fe4ac327aaaa6d6974 | treesnapshot (tar.gz zip) |
| parent | 18a6a8571fa150441de06e007e9c61856bfadc5d | commitdiff |
| parent | 3d946165e1177905103a25aeb374e018c510e540 | commitdiff |
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 --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 | blobhistory |
| sequencer.c | diff1 | diff2 | blobhistory |