summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-07 05:27:09 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-07 05:33:20 (GMT)
commit6506e156d99bd406661cd5d2e502db7c0960d716 (patch)
tree0dbdb4c474e4bca200579d5ea81d353c0a279c90 /.gitignore
parent740afd961370ba3925ba3a1edf5b499bb068fd9a (diff)
downloadgit-6506e156d99bd406661cd5d2e502db7c0960d716.zip
git-6506e156d99bd406661cd5d2e502db7c0960d716.tar.gz
git-6506e156d99bd406661cd5d2e502db7c0960d716.tar.bz2
Remove git-merge-recur
This was useful when the current recursive was in development, and the original Python version was still called git-merge-recursive. Now the synonym has served us well, it is time to move on. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d499949..d99372a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,7 +72,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