projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f88ed17) | patch
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.
authorFredrik Kuivinen <freku045@student.liu.se>
Tue, 13 Sep 2005 06:22:26 +0000 (08:22 +0200)
committerJunio C Hamano <junkio@cox.net>
Tue, 13 Sep 2005 07:20:54 +0000 (00:20 -0700)
commite4cf17ce0db2dab7c9525a732f86c5e3df3b4ed0
treee311046e26ff830a2232067e6ad00ba06db95e2dtree | snapshot
parentf88ed172e7a391bd907798ad2a3347a83cd24317commit | diff
[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.

Otherwise we would regret when Fredrik comes up with another merge
algorithm with different pros-and-cons with the current one.

Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
.gitignore diff | blob | history
Makefile diff | blob | history
git-merge-fredrik.py [deleted file] blob | history
git-merge-recursive.py [new file with mode: 0755] blob
git-merge.sh diff | blob | history
The core git plumbing