Merge branch 'ag/rebase-p'

diff --git a/.gitignore b/.gitignore
index 388cc4beee54faf9f06e9cfae75e7a256d368739..3284a1e9b1e80eae619024258ea96bb7e33bf943 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -119,6 +119,7 @@
 /git-rebase--helper
 /git-rebase--interactive
 /git-rebase--merge
+/git-rebase--preserve-merges
 /git-receive-pack
 /git-reflog
 /git-remote