diff options
| author | Danijar Hafner <mail@danijar.com> | 2016-05-18 18:05:13 +0200 |
|---|---|---|
| committer | ven <vendethiel@hotmail.fr> | 2016-05-18 18:05:13 +0200 |
| commit | 1c3de94e762953cd863368745f7f1e8071feeb26 (patch) | |
| tree | 423aca7ad11b68ed026f8e0cbe8320fade06bcb5 /git.html.markdown | |
| parent | 4310633b367d4ac92bb575a7463d50ba67d38fbe (diff) | |
Fix git pull --rebase explanation (#2262)
Diffstat (limited to 'git.html.markdown')
| -rw-r--r-- | git.html.markdown | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git.html.markdown b/git.html.markdown index 4d4b2a4e..47bac3ba 100644 --- a/git.html.markdown +++ b/git.html.markdown @@ -396,8 +396,8 @@ $ git pull origin master $ git pull # Merge in changes from remote branch and rebase -# branch commits onto your local repo, like: "git pull <remote> <branch>, git -# rebase <branch>" +# branch commits onto your local repo, like: "git fetch <remote> <branch>, git +# rebase <remote>/<branch>" $ git pull origin master --rebase ``` |