diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-11-06 15:55:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-11-06 15:55:19 -0800 |
| commit | 92fb952815d93a0bc883020987df2e558835ca1b (patch) | |
| tree | 4eeeb6fdf7b620412923677b17829d70c1b1254d /git-pull.txt | |
| parent | bf398b78bb6aa5397e8d23f3034438be9ffed0e2 (diff) | |
| download | git-htmldocs-92fb952815d93a0bc883020987df2e558835ca1b.tar.gz | |
Autogenerated HTML docs for v1.8.5-rc1
Diffstat (limited to 'git-pull.txt')
| -rw-r--r-- | git-pull.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-pull.txt b/git-pull.txt index beea10b14..6083aab87 100644 --- a/git-pull.txt +++ b/git-pull.txt @@ -42,6 +42,8 @@ Assume the following history exists and the current branch is A---B---C master on origin / D---E---F---G master + ^ + origin/master in your repository ------------ Then "`git pull`" will fetch and replay the changes from the remote @@ -51,7 +53,7 @@ result in a new commit along with the names of the two parent commits and a log message from the user describing the changes. ------------ - A---B---C remotes/origin/master + A---B---C origin/master / \ D---E---F---G---H master ------------ |