Merge branch 'tz/cred-netrc-cleanup'

[git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 388cc4b..3284a1e 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