Update draft release notes for 1.5.1

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b4dccd7b816e958273ec84b77e8ff4d1602461de..f15155d1b7bcb45db6a8d67eab51b535102353c1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,15 +33,16 @@ git-daemon
 git-diff
 git-diff-files
 git-diff-index
-git-diff-stages
 git-diff-tree
 git-describe
+git-fast-import
 git-fetch
 git-fetch-pack
 git-findtags
 git-fmt-merge-msg
 git-for-each-ref
 git-format-patch
+git-fsck
 git-fsck-objects
 git-gc
 git-get-tar-commit-id
@@ -70,7 +71,6 @@ git-merge-tree
 git-merge-octopus
 git-merge-one-file
 git-merge-ours
-git-merge-recur
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
@@ -100,7 +100,6 @@ git-repo-config
 git-request-pull
 git-rerere
 git-reset
-git-resolve
 git-rev-list
 git-rev-parse
 git-revert