diff options
| author | ven <vendethiel@hotmail.fr> | 2015-10-18 13:47:48 +0200 |
|---|---|---|
| committer | ven <vendethiel@hotmail.fr> | 2015-10-18 13:47:48 +0200 |
| commit | 769304a22fed96f8c396bfb84a70d65f03f0421c (patch) | |
| tree | 5ba4a51179b6a6ac58e945c6876a6705ac39b0ed /git.html.markdown | |
| parent | 60517832143f31606ae2e9e9a9b652d4271cc75b (diff) | |
| parent | 670e71c4990aefe739f108e15bf707eaf795f922 (diff) | |
Merge pull request #1619 from Chris54721/patch-3
[git/en] Fixed 'git pull' documentation
Diffstat (limited to 'git.html.markdown')
| -rw-r--r-- | git.html.markdown | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git.html.markdown b/git.html.markdown index f678f9d1..ed9aec15 100644 --- a/git.html.markdown +++ b/git.html.markdown @@ -371,9 +371,12 @@ Pulls from a repository and merges it with another branch. # Update your local repo, by merging in new changes # from the remote "origin" and "master" branch. # git pull <remote> <branch> -# git pull => implicitly defaults to => git pull origin master $ git pull origin master +# By default, git pull will update your current branch +# by merging in new changes from its remote-tracking branch +$ git pull + # Merge in changes from remote branch and rebase # branch commits onto your local repo, like: "git pull <remote> <branch>, git rebase <branch>" $ git pull origin master --rebase |