diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-25 20:22:39 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-25 20:22:39 (GMT) |
| commit | f3fec40e8d8798e5313f05a9273aef932fe4519e (patch) | |
| tree | 10f18d7bf621374a7cd1dc6dd3d7a1805800620e /Makefile | |
| parent | ebaf0a56f3f5f823df4166bc8fd626b523f864dc (diff) | |
| parent | 9384c0ca4885f5d6617f7eb71aeb79b11ad409ec (diff) | |
| download | git-f3fec40e8d8798e5313f05a9273aef932fe4519e.zip git-f3fec40e8d8798e5313f05a9273aef932fe4519e.tar.gz git-f3fec40e8d8798e5313f05a9273aef932fe4519e.tar.bz2 | |
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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -620,6 +620,7 @@ SCRIPT_LIB += git-mergetool--lib SCRIPT_LIB += git-parse-remote SCRIPT_LIB += git-rebase--am SCRIPT_LIB += git-rebase--interactive +SCRIPT_LIB += git-rebase--preserve-merges SCRIPT_LIB += git-rebase--merge SCRIPT_LIB += git-sh-setup SCRIPT_LIB += git-sh-i18n @@ -2397,6 +2398,7 @@ LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H) LOCALIZED_SH = $(SCRIPT_SH) LOCALIZED_SH += git-parse-remote.sh LOCALIZED_SH += git-rebase--interactive.sh +LOCALIZED_SH += git-rebase--preserve-merges.sh LOCALIZED_SH += git-sh-setup.sh LOCALIZED_PERL = $(SCRIPT_PERL) |