From 9688a882e12a80bc94d6e34d5a4b34816990e9eb Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 8 Dec 2005 14:04:33 -0800 Subject: Documentation: recursive is the default strategy these days. We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano --- Documentation/git-fetch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/git-fetch.txt') diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index 438240c0cf..d1b45f96ed 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -18,7 +18,7 @@ the objects necessary to complete them. The ref names and their object names of fetched refs are stored in `.git/FETCH_HEAD`. This information is left for a later merge -operation done by "git resolve" or "git octopus". +operation done by "git merge". OPTIONS -- cgit v1.2.1