| commit | 57e4b1c67a7d56677565c7943b16184e63db242c | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 10 Apr 2018 07:28:21 +0000 (10 16:28 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 10 Apr 2018 07:28:21 +0000 (10 16:28 +0900) | ||
| tree | f39cdd64f0fa3f98caf816e6fd89389d9074149b | treesnapshot (tar.gz zip) |
| parent | d19e556529f2e0ac64e3bb434d30c33433df9ffd | commitdiff |
| parent | f24cd4189dd778ba2d9bc7444d6a142642b106b9 | commitdiff |
Merge branch 'ws/rebase-p'
Code clean-up.
* ws/rebase-p:
rebase: remove merges_option and a blank line
rebase: remove unused code paths from git_rebase__interactive__preserve_merges
rebase: remove unused code paths from git_rebase__interactive
rebase: add and use git_rebase__interactive__preserve_merges
rebase: extract functions out of git_rebase__interactive
rebase: reindent function git_rebase__interactive
rebase: update invocation of rebase dot-sourced scripts
rebase-interactive: simplify pick_on_preserving_merges
Code clean-up.
* ws/rebase-p:
rebase: remove merges_option and a blank line
rebase: remove unused code paths from git_rebase__interactive__preserve_merges
rebase: remove unused code paths from git_rebase__interactive
rebase: add and use git_rebase__interactive__preserve_merges
rebase: extract functions out of git_rebase__interactive
rebase: reindent function git_rebase__interactive
rebase: update invocation of rebase dot-sourced scripts
rebase-interactive: simplify pick_on_preserving_merges