diff options
| author |  Alban Gruin <alban.gruin@gmail.com> | 2018-05-28 14:34:19 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-06-01 09:34:48 +0900 |
| commit | c42abfe785729587643dec5e7bba414dc3943817 (patch) | |
| tree | f6cdacbd96b39412a7c649a2a89d678789950d7c /.gitignore | |
| parent | rebase --rebase-merges: root commits can be cousins, too (diff) | |
| download | tgif-c42abfe785729587643dec5e7bba414dc3943817.tar.xz | |
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 <alban.gruin@gmail.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 833ef3b0b7..ef4925485b 100644 --- a/.gitignore +++ b/.gitignore @@ -117,6 +117,7 @@ /git-rebase--helper /git-rebase--interactive /git-rebase--merge +/git-rebase--preserve-merges /git-receive-pack /git-reflog /git-remote |