summaryrefslogtreecommitdiff
path: root/Documentation/git-fetch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-12-08 22:04:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-12-08 22:04:33 (GMT)
commit9688a882e12a80bc94d6e34d5a4b34816990e9eb (patch)
tree398cd1730afa1cb807d4b1dbcd68803724d37cdf /Documentation/git-fetch.txt
parent49ccb0877f64308662669a09db7b221419c13d0a (diff)
downloadgit-9688a882e12a80bc94d6e34d5a4b34816990e9eb.zip
git-9688a882e12a80bc94d6e34d5a4b34816990e9eb.tar.gz
git-9688a882e12a80bc94d6e34d5a4b34816990e9eb.tar.bz2
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>
Diffstat (limited to 'Documentation/git-fetch.txt')
-rw-r--r--Documentation/git-fetch.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 438240c..d1b45f9 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