Merge branch 'ag/rebase-p'

diff --git a/.gitignore b/.gitignore
index b2a1ae4a1d6293004b10d14c33bb64fd9d14fe8b..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
@@ -182,7 +183,7 @@
 /gitweb/gitweb.cgi
 /gitweb/static/gitweb.js
 /gitweb/static/gitweb.min.*
-/common-cmds.h
+/command-list.h
 *.tar.gz
 *.dsc
 *.deb