diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-04-10 16:28:21 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-10 16:28:21 +0900 |
| commit | 57e4b1c67a7d56677565c7943b16184e63db242c (patch) | |
| tree | f39cdd64f0fa3f98caf816e6fd89389d9074149b /git.c | |
| parent | Merge branch 'jk/diff-highlight-graph-fix' (diff) | |
| parent | rebase: remove merges_option and a blank line (diff) | |
| download | git-57e4b1c67a7d56677565c7943b16184e63db242c.tar.gz git-57e4b1c67a7d56677565c7943b16184e63db242c.zip | |
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
Diffstat (limited to 'git.c')
0 files changed, 0 insertions, 0 deletions