Manual.md: teach on rebase rather than merge

This commit is contained in:
Piotr Wójcik 2020-07-06 23:15:10 +02:00 committed by Piotr
parent c749fa3664
commit 02179c9534

View file

@ -1974,7 +1974,7 @@ To keep your forked repository always up to date, setup the `upstream` remote
to pull in new changes:
$ git remote add upstream git://github.com/void-linux/void-packages.git
$ git pull upstream master
$ git pull --rebase upstream master
<a id="help"></a>
## Help