[PR PATCH] Manual.md: teach on rebase rather than merge

[PR PATCH] Manual.md: teach on rebase rather than merge

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 343 bytes --]

There is a new pull request by Chocimier against master on the void-packages repository

https://github.com/Chocimier/void-packages-org manual-rebase
https://github.com/void-linux/void-packages/pull/23428

Manual.md: teach on rebase rather than merge


A patch file from https://github.com/void-linux/void-packages/pull/23428.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-manual-rebase-23428.patch --]
[-- Type: text/x-diff, Size: 711 bytes --]

From d6a284da6e4c36dd6cfdcb5f701f642ed8b12990 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20W=C3=B3jcik?= <chocimier@tlen.pl>
Date: Mon, 6 Jul 2020 23:15:10 +0200
Subject: [PATCH] Manual.md: teach on rebase rather than merge

---
 Manual.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

Re: [PR PATCH] [Merged]: Manual.md: teach on rebase rather than merge

[Chocimier]

[-- Attachment #1: Type: text/plain, Size: 178 bytes --]

There's a merged pull request on the void-packages repository

Manual.md: teach on rebase rather than merge
https://github.com/void-linux/void-packages/pull/23428

Description: