diff options
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 |