projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 49ccb08) | patch
Documentation: recursive is the default strategy these days.
authorJunio C Hamano <junkio@cox.net>
Thu, 8 Dec 2005 22:04:33 +0000 (14:04 -0800)
committerJunio C Hamano <junkio@cox.net>
Thu, 8 Dec 2005 22:04:33 +0000 (14:04 -0800)
commit9688a882e12a80bc94d6e34d5a4b34816990e9eb
tree398cd1730afa1cb807d4b1dbcd68803724d37cdftree | snapshot
parent49ccb0877f64308662669a09db7b221419c13d0acommit | diff
Documentation: recursive is the default strategy these days.

We still said resolve was the default in handful places.

Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/git-fetch.txt diff | blob | history
Documentation/merge-options.txt diff | blob | history
Documentation/merge-strategies.txt diff | blob | history
The core git plumbing