Skip to content

RFC rebase-interactive: Add git_rebase__interactive__preserve_merges

Wink Saville git 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v2 RFC Latest1 patch 3 repliesIn review

Patches in v2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/1rebase-interactive: Add git_rebase__interactive__preserve_mergesgit-rebase--interactive.sh git-rebase.sh+273 -2123 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [RFC PATCH v2 0/1] rebase-interactive: Add git_rebase__interactive__preserve_merges

Version 2 keeps all changes in git-rebase--interactive.sh this should make it easier to use blame. But there is quite a bit of refactoring and reformatting so using "git blame -w" or "git blame -w -C -C" is needed to improve the results of blame.

I can break this into several patches to have the history show the code movement more directly if that is desired.

Wink Saville (1):
rebase-interactive: Add git_rebase__interactive__preserve_merges

 git-rebase--interactive.sh | 469 +++++++++++++++++++++++++--------------------
 git-rebase.sh              |  16 +-
 2 files changed, 273 insertions(+), 212 deletions(-)
Signature · 1 line
2.16.2