From c42abfe785729587643dec5e7bba414dc3943817 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Mon, 28 May 2018 14:34:19 +0200 Subject: 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 --- .gitignore | 1 + 1 file changed, 1 insertion(+) (limited to '.gitignore') 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 -- cgit v1.2.3