Added a few examples to git-pull man page.

[git.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 52cb9e2..3edf6b4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -50,10 +50,13 @@ git-merge-base
 git-merge-index
 git-merge-octopus
 git-merge-one-file
+git-merge-ours
 git-merge-recursive
 git-merge-resolve
 git-merge-stupid
 git-mktag
+git-name-rev
+git-mv
 git-octopus
 git-pack-objects
 git-parse-remote
@@ -78,6 +81,7 @@ git-revert
 git-send-email
 git-send-pack
 git-sh-setup
+git-shell
 git-shortlog
 git-show-branch
 git-show-index