diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-12-11 16:49:45 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-11 16:49:45 -0800 |
| commit | a9572072f0ab0ac97e64b0dc01254a3ad95befe1 (patch) | |
| tree | 2375e3b4aea11444375f9f587c8ca4cd8d22d6d0 /Documentation/git-fetch.txt | |
| parent | 423325a2d24638ddcc82ce47be5e40be550f4507 (diff) | |
| parent | b825e6ff5d003db8efd1ed43cdbbb9d637df0a0c (diff) | |
| download | git-0.99.9m.tar.xz | |
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 |