diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-03-29 11:08:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-29 11:08:09 -0700 |
| commit | 56173d28a5fb811c9525a8d5052ab6d83a07122e (patch) | |
| tree | d3a0dba51a0e6760184c4ffd7e4f2f9bdf23b8f8 /git-rebase--merge.sh | |
| parent | Merge branch 'pw/sequencer-in-process-commit' (diff) | |
| parent | rebase: respect --no-keep-empty (diff) | |
| download | tgif-56173d28a5fb811c9525a8d5052ab6d83a07122e.tar.xz | |
Merge branch 'pw/rebase-keep-empty-fixes' into pw/rebase-signoff
* 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 2.16.2
Diffstat (limited to 'git-rebase--merge.sh')
0 files changed, 0 insertions, 0 deletions