diff options
| author |  Piotr Wójcik <chocimier@tlen.pl> | 2020-07-06 23:15:10 +0200 |
|---|---|---|
| committer | Piotr <chocimier@tlen.pl> | 2020-07-07 18:01:04 +0200 |
| commit | 02179c953473f9348270d401e4becd66f6d4f5d7 (patch) | |
| tree | f16a7f32fac1a527dd7965ff8aa4e0ed41d7da0e /Manual.md | |
| parent | torbrowser-launcher: add dbus-glib dependency (diff) | |
Manual.md: teach on rebase rather than merge
Diffstat (limited to 'Manual.md')
| -rw-r--r-- | Manual.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Manual.md b/Manual.md index c612479ec73..10082b68da5 100644 --- a/Manual.md +++ b/Manual.md @@ -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 |