diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-08 23:04:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-08 23:04:33 +0100 |
| commit | 9688a882e12a80bc94d6e34d5a4b34816990e9eb (patch) | |
| tree | 398cd1730afa1cb807d4b1dbcd68803724d37cdf /Documentation/git-fetch.txt | |
| parent | Make sure we use compat/subprocess.py with Python 2.3 while running tests. (diff) | |
| download | git-9688a882e12a80bc94d6e34d5a4b34816990e9eb.tar.xz git-9688a882e12a80bc94d6e34d5a4b34816990e9eb.zip | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
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 |