| commit | f3fec40e8d8798e5313f05a9273aef932fe4519e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jun 2018 20:22:39 +0000 (25 13:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 25 Jun 2018 20:22:39 +0000 (25 13:22 -0700) | ||
| tree | 10f18d7bf621374a7cd1dc6dd3d7a1805800620e | treesnapshot (tar.gz zip) |
| parent | ebaf0a56f3f5f823df4166bc8fd626b523f864dc | commitdiff |
| parent | 9384c0ca4885f5d6617f7eb71aeb79b11ad409ec | commitdiff |
Merge branch 'ag/rebase-p'
Separate "rebase -p" codepath out of "rebase -i" implementation to
slim down the latter and make it easier to manage.
* ag/rebase-p:
rebase: remove -p code from git-rebase--interactive.sh
rebase: use the new git-rebase--preserve-merges.sh
rebase: strip unused code in git-rebase--preserve-merges.sh
rebase: introduce a dedicated backend for --preserve-merges
Separate "rebase -p" codepath out of "rebase -i" implementation to
slim down the latter and make it easier to manage.
* ag/rebase-p:
rebase: remove -p code from git-rebase--interactive.sh
rebase: use the new git-rebase--preserve-merges.sh
rebase: strip unused code in git-rebase--preserve-merges.sh
rebase: introduce a dedicated backend for --preserve-merges
| .gitignore | diff1 | diff2 | blobhistory |
| Makefile | diff1 | diff2 | blobhistory |
| git-rebase--interactive.sh | diff1 | diff2 | blobhistory |