On Fri, Mar 23, 2018 at 3:39 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Wink Saville <wink@xxxxxxxxxxx> writes: > >> On Fri, Mar 23, 2018 at 2:25 PM, Wink Saville <wink@xxxxxxxxxxx> wrote: >>> Reworked patch 1 so that all of the backend scriptlets >>> used by git-rebase use a normal function style invocation. >>> >>> Merged the previous patch 2 and 3 have been squashed which >>> provides reviewers a little easier time to detect any changes >>> during extraction of the functions. >>> >>> Wink Saville (8): >>> rebase-interactive: simplify pick_on_preserving_merges >>> rebase: update invocation of rebase dot-sourced scripts >>> Indent function git_rebase__interactive >>> Extract functions out of git_rebase__interactive >>> Add and use git_rebase__interactive__preserve_merges >>> Remove unused code paths from git_rebase__interactive >>> Remove unused code paths from git_rebase__interactive__preserve_merges >>> Remove merges_option and a blank line >>> >>> git-rebase--am.sh | 11 -- >>> git-rebase--interactive.sh | 407 ++++++++++++++++++++++++--------------------- >>> git-rebase--merge.sh | 11 -- >>> git-rebase.sh | 1 + >>> 4 files changed, 216 insertions(+), 214 deletions(-) >>> >>> -- >>> 2.16.2 >>> >> >> Argh, I misspelled Junio's email address, so when you reply-all try >> to remember to remove "gister@xxxxxxxxx" from the cc: list. > > Heh, too late ;-) > > I queued everything (with all patch 3-8/8 retitled to share a > common prefix, so that "git shortlog" output would stay sane) > and I think I resolved the conflicts with Dscho's recreate-merges > topic correctly. Please double check what will appear on 'pu' later > today. > > Thanks. > OK, thank you!
