Skip to content

Commit c42abfe

Browse files
agrngitster
authored andcommitted
rebase: introduce a dedicated backend for --preserve-merges
This duplicates git-rebase--interactive.sh to git-rebase--preserve-merges.sh. This is done to split -p from -i. No modifications are made to this file here, but any code that is not used by -p will be stripped in the next commit. Signed-off-by: Alban Gruin <[email protected]>
1 parent 8fa6eea commit c42abfe

File tree

3 files changed

+1072
-0
lines changed

3 files changed

+1072
-0
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@
117117
/git-rebase--helper
118118
/git-rebase--interactive
119119
/git-rebase--merge
120+
/git-rebase--preserve-merges
120121
/git-receive-pack
121122
/git-reflog
122123
/git-remote

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -582,6 +582,7 @@ SCRIPT_LIB += git-mergetool--lib
582582
SCRIPT_LIB += git-parse-remote
583583
SCRIPT_LIB += git-rebase--am
584584
SCRIPT_LIB += git-rebase--interactive
585+
SCRIPT_LIB += git-rebase--preserve-merges
585586
SCRIPT_LIB += git-rebase--merge
586587
SCRIPT_LIB += git-sh-setup
587588
SCRIPT_LIB += git-sh-i18n
@@ -2271,6 +2272,7 @@ LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
22712272
LOCALIZED_SH = $(SCRIPT_SH)
22722273
LOCALIZED_SH += git-parse-remote.sh
22732274
LOCALIZED_SH += git-rebase--interactive.sh
2275+
LOCALIZED_SH += git-rebase--preserve-merges.sh
22742276
LOCALIZED_SH += git-sh-setup.sh
22752277
LOCALIZED_PERL = $(SCRIPT_PERL)
22762278

0 commit comments

Comments
 (0)