summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPeter Anvin <hpa@tazenda.sc.orionmulti.com>2005-09-28 23:20:08 -0700
committerPeter Anvin <hpa@tazenda.sc.orionmulti.com>2005-09-28 23:20:08 -0700
commit0542f48c894f924d94a2bd05f7e4cbab25656112 (patch)
tree40d87b65df0788b5c1bddfb4095f36b6146df66a /.gitignore
parenta23cd8ece70262fac2a80ef3e454c1cf1c63605a (diff)
parentbf7960eb51a26bcf52f27a60bfcf005661266b1e (diff)
downloadgit-0542f48c894f924d94a2bd05f7e4cbab25656112.tar.gz
Merge with http://www.kernel.org/pub/scm/git/git.git
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 145690f622..c3eb9543ff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ git-diff-stages
git-diff-tree
git-fetch
git-fetch-pack
+git-fmt-merge-msg
git-format-patch
git-fsck-objects
git-get-tar-commit-id
@@ -86,6 +87,7 @@ git-tar-tree
git-unpack-file
git-unpack-objects
git-update-index
+git-update-ref
git-update-server-info
git-upload-pack
git-var