projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8391548) | patch
Deprecate merge-recursive.py
authorJunio C Hamano <junkio@cox.net>
Mon, 25 Sep 2006 02:49:47 +0000 (19:49 -0700)
committerJunio C Hamano <junkio@cox.net>
Mon, 25 Sep 2006 03:33:35 +0000 (20:33 -0700)
commita06f678eb998862ea83b73e46ece32f99132935b
treed7604f01f42a87ffbb4bc6eb8ebe8b5dc9adf0b5tree | snapshot
parent8391548e5e78677eb81f97334d998418802ea194commit | diff
Deprecate merge-recursive.py

This renames merge-recursive written in Python to merge-recursive-old,
and makes merge-recur as a synonym to merge-recursive.  We do not remove
merge-recur yet, but we will remove merge-recur and merge-recursive-old
in a few releases down the road.

Signed-off-by: Junio C Hamano <junkio@cox.net>
.gitignore diff | blob | history
Makefile diff | blob | history
configure.ac diff | blob | history
git-merge-recursive-old.py [moved from git-merge-recursive.py with 100% similarity] blob | history
git-merge.sh diff | blob | history
git-rebase.sh diff | blob | history
t/test-lib.sh diff | blob | history
Git—the stupid content tracker