Merge branch 'mz/rebase'

diff --git a/.gitignore b/.gitignore
index 2cf3ca5808b51be3921a0f25b5871f806ce447e1..711fce7e08beea95d1870047452131e3bf5278dd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -101,7 +101,9 @@
 /git-quiltimport
 /git-read-tree
 /git-rebase
+/git-rebase--am
 /git-rebase--interactive
+/git-rebase--merge
 /git-receive-pack
 /git-reflog
 /git-relink