diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-25 06:28:49 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 06:28:49 +0200 |
| commit | d892beef52a293b271538481dbc76014672ddf09 (patch) | |
| tree | e9f7896908c60aff2a25a6fe4ac327aaaa6d6974 /git-rebase--interactive.sh | |
| parent | Merge branch 'cb/git-gui-ttk-style' (diff) | |
| parent | rebase: respect --no-keep-empty (diff) | |
| download | git-d892beef52a293b271538481dbc76014672ddf09.tar.xz git-d892beef52a293b271538481dbc76014672ddf09.zip | |
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
Diffstat (limited to 'git-rebase--interactive.sh')
0 files changed, 0 insertions, 0 deletions