mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-01 14:57:52 +01:00
Code Activity

rebase: introduce a dedicated backend for --preserve-merges

Browse source 
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 <alban.gruin@gmail.com>
This commit is contained in:
Alban Gruin 2018-05-28 14:34:19 +02:00 committed by Junio C Hamano
parent 8fa6eea0ff
commit c42abfe785
3 changed files with 1072 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -117,6 +117,7 @@
/git-rebase--helper /git-rebase--helper
/git-rebase--interactive /git-rebase--interactive
/git-rebase--merge /git-rebase--merge
/git-rebase--preserve-merges
/git-receive-pack /git-receive-pack
/git-reflog /git-reflog
/git-remote /git-remote

2
Makefile
View file

@ -582,6 +582,7 @@ SCRIPT_LIB += git-mergetool--lib
SCRIPT_LIB += git-parse-remote SCRIPT_LIB += git-parse-remote
SCRIPT_LIB += git-rebase--am SCRIPT_LIB += git-rebase--am
SCRIPT_LIB += git-rebase--interactive SCRIPT_LIB += git-rebase--interactive
SCRIPT_LIB += git-rebase--preserve-merges
SCRIPT_LIB += git-rebase--merge SCRIPT_LIB += git-rebase--merge
SCRIPT_LIB += git-sh-setup SCRIPT_LIB += git-sh-setup
SCRIPT_LIB += git-sh-i18n SCRIPT_LIB += git-sh-i18n
@ -2271,6 +2272,7 @@ LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
LOCALIZED_SH = $(SCRIPT_SH) LOCALIZED_SH = $(SCRIPT_SH)
LOCALIZED_SH += git-parse-remote.sh LOCALIZED_SH += git-parse-remote.sh
LOCALIZED_SH += git-rebase--interactive.sh LOCALIZED_SH += git-rebase--interactive.sh
LOCALIZED_SH += git-rebase--preserve-merges.sh
LOCALIZED_SH += git-sh-setup.sh LOCALIZED_SH += git-sh-setup.sh
LOCALIZED_PERL = $(SCRIPT_PERL) LOCALIZED_PERL = $(SCRIPT_PERL)

1069
git-rebase--preserve-merges.sh Normal file
View file

File diff suppressed because it is too large Load diff