Skip to content

Commit f3fec40

Browse files
gitstergitster
committed
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
2 parents ebaf0a5 + 9384c0c commit f3fec40

File tree

5 files changed

+1048
-803
lines changed

5 files changed

+1048
-803
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
/git-rebase--helper
120120
/git-rebase--interactive
121121
/git-rebase--merge
122+
/git-rebase--preserve-merges
122123
/git-receive-pack
123124
/git-reflog
124125
/git-remote

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,7 @@ SCRIPT_LIB += git-mergetool--lib
620620
SCRIPT_LIB += git-parse-remote
621621
SCRIPT_LIB += git-rebase--am
622622
SCRIPT_LIB += git-rebase--interactive
623+
SCRIPT_LIB += git-rebase--preserve-merges
623624
SCRIPT_LIB += git-rebase--merge
624625
SCRIPT_LIB += git-sh-setup
625626
SCRIPT_LIB += git-sh-i18n
@@ -2397,6 +2398,7 @@ LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
23972398
LOCALIZED_SH = $(SCRIPT_SH)
23982399
LOCALIZED_SH += git-parse-remote.sh
23992400
LOCALIZED_SH += git-rebase--interactive.sh
2401+
LOCALIZED_SH += git-rebase--preserve-merges.sh
24002402
LOCALIZED_SH += git-sh-setup.sh
24012403
LOCALIZED_PERL = $(SCRIPT_PERL)
24022404

0 commit comments

Comments
 (0)