summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-08-03 23:17:51 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-08-03 23:17:51 (GMT)
commitc8b87ef8b0da6b08a19ed4f98eb58f46748af1e9 (patch)
treeb521e9e696ce211f42d5c5795b600b8a38134e88 /.gitignore
parentc1f3089e4bb5a3e8e8f92915800f2d5a2d4dd246 (diff)
downloadgit-c8b87ef8b0da6b08a19ed4f98eb58f46748af1e9.zip
git-c8b87ef8b0da6b08a19ed4f98eb58f46748af1e9.tar.gz
git-c8b87ef8b0da6b08a19ed4f98eb58f46748af1e9.tar.bz2
.gitignore: git-merge-recur is a built file.
Also it is OK to omit the documentation for it at least for now. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index fb0fa3f..2299e36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ 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