diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-07-10 14:01:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-14 23:35:31 -0700 |
| commit | dc29bc8bd243fcd20815c7dddc15dbae30747c28 (patch) | |
| tree | 6041400cbc7c8949ea6cd38cde5aec7ca78eee5e /Documentation/git-merge-index.txt | |
| parent | tutorial: use prompt with user names in example, to clarify who is doing what (diff) | |
| download | tgif-dc29bc8bd243fcd20815c7dddc15dbae30747c28.tar.xz | |
tutorial: clarify "pull" is "fetch + merge"
The document says that a fetch with a configured remote stores what are
fetched in the remote tracking branches "Unlike the longhand form", but
there is no longhand form "fetch" demonstrated earlier.
This adds a missing demonstration of the longhand form, and a new
paragraph to explain why some people might want to fetch before pull.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions