[PR PATCH] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[PR PATCH] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[ericonr]

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

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

https://github.com/ericonr/void-packages gitforce
https://github.com/void-linux/void-packages/pull/23788

Manual: move all git info to CONTRIB, explain how to use different branch in PR.
A little bit of reorganizing, and took @Chocimier's command from https://github.com/void-linux/void-packages/pull/23695#issuecomment-663226818

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

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

From af790d96f6e11c0a480f79bc3a709e085bc0856a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 23 Jul 2020 19:44:57 -0300
Subject: [PATCH] Manual: move all git info to CONTRIB, explain how to use
 different branch in PR.

---
 CONTRIBUTING.md | 19 +++++++++++++++++++
 Manual.md       | 13 -------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a38751f55ec..240e23e00cf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,6 +16,19 @@ For this guide, we assume you have basic knowledge about [git](http://git-scm.or
 
 Please note that we do not accept any packages containing non-release versions, such as specific git- or svn-revisions anymore.
 
+To get started, fork the void-linux `void-packages` git repository on GitHub and clone it:
+
+    $ git clone git@github.com:<user>/void-packages.git
+
+Once you've made changes to your forked repository, you can [submit a pull
+request](#starting-a-pull-request).
+
+To keep your forked repository 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 --rebase upstream master
+
 ### Creating a new template
 
 You can use the helper tool `xnew`, from the [xtools](https://github.com/chneukirchen/xtools) package, to create new templates:
@@ -77,6 +90,7 @@ For further details, see the output of `./xbps-src -h`.
 ### Starting a pull request
 
 Once you have successfully built the package, you can start a pull request.
+See https://help.github.com/articles/fork-a-repo for more information.
 
 Most pull requests should only contain a single package and dependencies which are not part of void-packages yet.
 
@@ -111,6 +125,11 @@ If it stays inactive further, it will be closed.
 
 Please abstain from temporarily closing a pull request while revising the templates. Instead, leave a comment on the PR describing what still needs work, or add "[WIP]" to the PR title. Only close your pull request if you're sure you don't want your changes to be included.
 
+Furthermore, if there are issues with your git history and you would like to use another branch for the PR,
+please don't close the original and open another one. Use the following command:
+
+    $ git push --force FORK NEW_BRANCH:BRANCH_OF_EXISTING_PR
+
 #### Publishing the package
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
diff --git a/Manual.md b/Manual.md
index 5b49dc5ddd4..ebc4ac056c1 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1991,22 +1991,9 @@ otherwise the `debug` packages won't have debugging symbols.
 <a id="contributing"></a>
 ### Contributing via git
 
-Fork the voidlinux `void-packages` git repository on github and clone it:
-
-    $ git clone git@github.com:<user>/void-packages.git
-
 See [CONTRIBUTING.md](./CONTRIBUTING.md) for information on how to format your
 commits and other tips for contributing.
 
-Once you've made changes to your `forked` repository you can submit
-a github pull request; see https://help.github.com/articles/fork-a-repo for more information.
-
-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 --rebase upstream master
-
 <a id="help"></a>
 ## Help
 

Re: [PR PATCH] [Updated] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[ericonr]

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

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages gitforce
https://github.com/void-linux/void-packages/pull/23788

Manual: move all git info to CONTRIB, explain how to use different branch in PR.
A little bit of reorganizing, and took @Chocimier's command from https://github.com/void-linux/void-packages/pull/23695#issuecomment-663226818

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

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

From c5b1dfb1434dd765660552d4dc8e0fc885924f50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 23 Jul 2020 19:44:57 -0300
Subject: [PATCH] Manual: move all git info to CONTRIB, explain how to use
 different branch in PR.

---
 CONTRIBUTING.md | 19 +++++++++++++++++++
 Manual.md       | 16 +---------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a38751f55ec..240e23e00cf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,6 +16,19 @@ For this guide, we assume you have basic knowledge about [git](http://git-scm.or
 
 Please note that we do not accept any packages containing non-release versions, such as specific git- or svn-revisions anymore.
 
+To get started, fork the void-linux `void-packages` git repository on GitHub and clone it:
+
+    $ git clone git@github.com:<user>/void-packages.git
+
+Once you've made changes to your forked repository, you can [submit a pull
+request](#starting-a-pull-request).
+
+To keep your forked repository 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 --rebase upstream master
+
 ### Creating a new template
 
 You can use the helper tool `xnew`, from the [xtools](https://github.com/chneukirchen/xtools) package, to create new templates:
@@ -77,6 +90,7 @@ For further details, see the output of `./xbps-src -h`.
 ### Starting a pull request
 
 Once you have successfully built the package, you can start a pull request.
+See https://help.github.com/articles/fork-a-repo for more information.
 
 Most pull requests should only contain a single package and dependencies which are not part of void-packages yet.
 
@@ -111,6 +125,11 @@ If it stays inactive further, it will be closed.
 
 Please abstain from temporarily closing a pull request while revising the templates. Instead, leave a comment on the PR describing what still needs work, or add "[WIP]" to the PR title. Only close your pull request if you're sure you don't want your changes to be included.
 
+Furthermore, if there are issues with your git history and you would like to use another branch for the PR,
+please don't close the original and open another one. Use the following command:
+
+    $ git push --force FORK NEW_BRANCH:BRANCH_OF_EXISTING_PR
+
 #### Publishing the package
 
 Once the reviewers have merged the pull request, our [build server](http://build.voidlinux.org) is automatically triggered and builds
diff --git a/Manual.md b/Manual.md
index 5b49dc5ddd4..31aefd3d7f2 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1991,21 +1991,7 @@ otherwise the `debug` packages won't have debugging symbols.
 <a id="contributing"></a>
 ### Contributing via git
 
-Fork the voidlinux `void-packages` git repository on github and clone it:
-
-    $ git clone git@github.com:<user>/void-packages.git
-
-See [CONTRIBUTING.md](./CONTRIBUTING.md) for information on how to format your
-commits and other tips for contributing.
-
-Once you've made changes to your `forked` repository you can submit
-a github pull request; see https://help.github.com/articles/fork-a-repo for more information.
-
-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 --rebase upstream master
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for information on how to contribute to `void-packages`.
 
 <a id="help"></a>
 ## Help

Re: Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23788#issuecomment-663625726

Comment:
Please save description of actions in order of their execution.

"Fork a repo" does not describe how to send PR.

"git push --force" paragraph should be put in "Review" chapter. New branch is way to go when usual rewriting history caused troubles. Could you add something like following?

> More powerful way to modify commits than `git commit --amend` is [`git rebase -i HEAD~9`](https://git-scm.com/docs/git-rebase#_interactive_mode). It allows to join, reorder, change description of past commits and more.
    Alternatively, you can make other branch and push it to existing PR:
        git checkout master
        git checkout -b \<attempt2>
        # do changes anew
        git push -f \<fork> \<attempt2>:\<branch of pr>

Again: having minimal description of how to share done work at end of manual looks reasonable to me.

Re: [PR PATCH] [Updated] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[ericonr]

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

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages gitforce
https://github.com/void-linux/void-packages/pull/23788

Manual: move all git info to CONTRIB, explain how to use different branch in PR.
A little bit of reorganizing, and took @Chocimier's command from https://github.com/void-linux/void-packages/pull/23695#issuecomment-663226818

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

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

From ba3f74a34c2dc29d871c07596aadb92941d67e5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 23 Jul 2020 19:44:57 -0300
Subject: [PATCH] Manual: move all git info to CONTRIB, explain how to use
 different branch in PR.

---
 CONTRIBUTING.md | 23 ++++++++++++++++++++++-
 Manual.md       | 16 +---------------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a38751f55ec..23dfb607873 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,6 +16,19 @@ For this guide, we assume you have basic knowledge about [git](http://git-scm.or
 
 Please note that we do not accept any packages containing non-release versions, such as specific git- or svn-revisions anymore.
 
+To get started, [fork](https://help.github.com/articles/fork-a-repo) the void-linux `void-packages` git repository on GitHub and clone it:
+
+    $ git clone git@github.com:<user>/void-packages.git
+
+Once you've made changes to your forked repository, you can [submit a pull
+request](#starting-a-pull-request).
+
+To keep your forked repository 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 --rebase upstream master
+
 ### Creating a new template
 
 You can use the helper tool `xnew`, from the [xtools](https://github.com/chneukirchen/xtools) package, to create new templates:
@@ -76,7 +89,7 @@ For further details, see the output of `./xbps-src -h`.
 
 ### Starting a pull request
 
-Once you have successfully built the package, you can start a pull request.
+Once you have successfully built the package, you can [start a pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request).
 
 Most pull requests should only contain a single package and dependencies which are not part of void-packages yet.
 
@@ -101,6 +114,14 @@ We recommend having only a single commit for pull request, so if you need to mak
     $ git add <file>
     $ git commit --amend
     $ git push -f
+    
+A more powerful way of modifying commits than `git commit --amend` is with `git rebase -i HEAD~9`. It allows you to join, reorder, change description of past commits and more.
+
+Alternatively, if there are issues with your git history, you can make another branch and push it to the existing PR:
+
+    $ git checkout master -b <attempt2>
+    $ # do changes anew
+    $ git push -f <fork> <attempt2>:<branch-of-pr>
 
 #### Closing the pull request
 
diff --git a/Manual.md b/Manual.md
index 5b49dc5ddd4..31aefd3d7f2 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1991,21 +1991,7 @@ otherwise the `debug` packages won't have debugging symbols.
 <a id="contributing"></a>
 ### Contributing via git
 
-Fork the voidlinux `void-packages` git repository on github and clone it:
-
-    $ git clone git@github.com:<user>/void-packages.git
-
-See [CONTRIBUTING.md](./CONTRIBUTING.md) for information on how to format your
-commits and other tips for contributing.
-
-Once you've made changes to your `forked` repository you can submit
-a github pull request; see https://help.github.com/articles/fork-a-repo for more information.
-
-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 --rebase upstream master
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for information on how to contribute to `void-packages`.
 
 <a id="help"></a>
 ## Help

Re: Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23788#issuecomment-663660849

Comment:
I tried to include your suggestions, thanks!

Could I just repeat the forking info in the Manual? I mostly wanted to avoid duplication.

Re: [PR REVIEW] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23788#discussion_r460213315

Comment:
Please link https://git-scm.com/docs/git-rebase#_interactive_mode here.

Re: [PR REVIEW] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23788#discussion_r460212802

Comment:
Oh nice, it's obvious what it does when you see it, but I didn't know it's possible.

Re: [PR REVIEW] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23788#discussion_r460217657

Comment:
Link to ~here from "Instead, just forcibly git push" would be useful.

Re: [PR REVIEW] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23788#discussion_r460215893

Comment:
Not sure where it should go. End of "Starting a pull request"?

Re: [PR REVIEW] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23788#discussion_r460214786

Comment:
Nothing to submit at the moment.

Re: [PR PATCH] [Updated] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[ericonr]

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

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages gitforce
https://github.com/void-linux/void-packages/pull/23788

Manual: move all git info to CONTRIB, explain how to use different branch in PR.
A little bit of reorganizing, and took @Chocimier's command from https://github.com/void-linux/void-packages/pull/23695#issuecomment-663226818

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

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

From 4b26f913da2f87ebc1cf70a08f9de90828e9a7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 23 Jul 2020 19:44:57 -0300
Subject: [PATCH] Manual: some git info to CONTRIB, explain how to use
 different branch in PR.

---
 CONTRIBUTING.md | 23 +++++++++++++++++++++--
 Manual.md       | 13 ++++---------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a38751f55ec..6e5dcfb9c6d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,6 +16,15 @@ For this guide, we assume you have basic knowledge about [git](http://git-scm.or
 
 Please note that we do not accept any packages containing non-release versions, such as specific git- or svn-revisions anymore.
 
+To get started, [fork](https://help.github.com/articles/fork-a-repo) the void-linux `void-packages` git repository on GitHub and clone it:
+
+    $ git clone git@github.com:<user>/void-packages.git
+
+To keep your forked repository 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 --rebase upstream master
+
 ### Creating a new template
 
 You can use the helper tool `xnew`, from the [xtools](https://github.com/chneukirchen/xtools) package, to create new templates:
@@ -48,6 +57,8 @@ Once you have built your template file or files, the commit message should have
 
 If you want to describe your changes in more detail, add an empty line followed by those details ([example](https://github.com/void-linux/void-packages/commit/f1c45a502086ba1952f23ace9084a870ce437bc6)).
 
+Once you've made changes to your forked repository, you can [submit a pull request](#starting-a-pull-request).
+
 Pull requests are automatically submitted for Continuous Integration (CI) testing to ensure packages build on various combinations of libc and architecture.
 Packages that take longer than 50 minutes to build (for example, Firefox or the Linux kernel) will fail CI and should include `[ci skip]` in the last line of the last commit message in the PR to avoid wasting CI builder time.
 Use your best judgment on build times based on your local building experience. If you skip CI when submitting a PR, please build and cross-build for a variety of architectures locally, with both glibc and musl, and note your local results in PR comments.
@@ -76,14 +87,14 @@ For further details, see the output of `./xbps-src -h`.
 
 ### Starting a pull request
 
-Once you have successfully built the package, you can start a pull request.
+Once you have successfully built the package, you can [start a pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request).
 
 Most pull requests should only contain a single package and dependencies which are not part of void-packages yet.
 
 If you make updates to packages containing a soname bump, you also need to update `common/shlibs` and revbump all packages that are dependant.
 There should be a commit for each package revbump, and those commits should be part of the same pull request.
 
-When you make changes to your pull request, please *do not close and reopen your pull request*. Instead, just forcibly git push, overwriting any old commits. Closing and opening your pull requests repeatedly spams the Void maintainers.
+When you make changes to your pull request, please *do not close and reopen your pull request*. Instead, just [forcibly git push](#review), overwriting any old commits. Closing and opening your pull requests repeatedly spams the Void maintainers.
 
 #### Travis
 
@@ -101,6 +112,14 @@ We recommend having only a single commit for pull request, so if you need to mak
     $ git add <file>
     $ git commit --amend
     $ git push -f
+    
+A more powerful way of modifying commits than using `git commit --amend` is with [git-rebase](https://git-scm.com/docs/git-rebase#_interactive_mode), which allows you to join, reorder, change description of past commits and more.
+
+Alternatively, if there are issues with your git history, you can make another branch and push it to the existing PR:
+
+    $ git checkout master -b <attempt2>
+    $ # do changes anew
+    $ git push -f <fork> <attempt2>:<branch-of-pr>
 
 #### Closing the pull request
 
diff --git a/Manual.md b/Manual.md
index 5b49dc5ddd4..6c58c70709b 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1991,22 +1991,17 @@ otherwise the `debug` packages won't have debugging symbols.
 <a id="contributing"></a>
 ### Contributing via git
 
-Fork the voidlinux `void-packages` git repository on github and clone it:
+To get started, [fork](https://help.github.com/articles/fork-a-repo) the void-linux `void-packages` git repository on GitHub and clone it:
 
     $ git clone git@github.com:<user>/void-packages.git
 
-See [CONTRIBUTING.md](./CONTRIBUTING.md) for information on how to format your
-commits and other tips for contributing.
-
-Once you've made changes to your `forked` repository you can submit
-a github pull request; see https://help.github.com/articles/fork-a-repo for more information.
-
-To keep your forked repository always up to date, setup the `upstream` remote
-to pull in new changes:
+To keep your forked repository 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 --rebase upstream master
 
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for more information on how to contribute to `void-packages`.
+
 <a id="help"></a>
 ## Help
 

Re: [PR PATCH] [Updated] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[ericonr]

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

There is an updated pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages gitforce
https://github.com/void-linux/void-packages/pull/23788

Manual: move all git info to CONTRIB, explain how to use different branch in PR.
A little bit of reorganizing, and took @Chocimier's command from https://github.com/void-linux/void-packages/pull/23695#issuecomment-663226818

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

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

From 4b26f913da2f87ebc1cf70a08f9de90828e9a7a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Thu, 23 Jul 2020 19:44:57 -0300
Subject: [PATCH] Manual: some git info to CONTRIB, explain how to use
 different branch in PR.

---
 CONTRIBUTING.md | 23 +++++++++++++++++++++--
 Manual.md       | 13 ++++---------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a38751f55ec..6e5dcfb9c6d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,6 +16,15 @@ For this guide, we assume you have basic knowledge about [git](http://git-scm.or
 
 Please note that we do not accept any packages containing non-release versions, such as specific git- or svn-revisions anymore.
 
+To get started, [fork](https://help.github.com/articles/fork-a-repo) the void-linux `void-packages` git repository on GitHub and clone it:
+
+    $ git clone git@github.com:<user>/void-packages.git
+
+To keep your forked repository 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 --rebase upstream master
+
 ### Creating a new template
 
 You can use the helper tool `xnew`, from the [xtools](https://github.com/chneukirchen/xtools) package, to create new templates:
@@ -48,6 +57,8 @@ Once you have built your template file or files, the commit message should have
 
 If you want to describe your changes in more detail, add an empty line followed by those details ([example](https://github.com/void-linux/void-packages/commit/f1c45a502086ba1952f23ace9084a870ce437bc6)).
 
+Once you've made changes to your forked repository, you can [submit a pull request](#starting-a-pull-request).
+
 Pull requests are automatically submitted for Continuous Integration (CI) testing to ensure packages build on various combinations of libc and architecture.
 Packages that take longer than 50 minutes to build (for example, Firefox or the Linux kernel) will fail CI and should include `[ci skip]` in the last line of the last commit message in the PR to avoid wasting CI builder time.
 Use your best judgment on build times based on your local building experience. If you skip CI when submitting a PR, please build and cross-build for a variety of architectures locally, with both glibc and musl, and note your local results in PR comments.
@@ -76,14 +87,14 @@ For further details, see the output of `./xbps-src -h`.
 
 ### Starting a pull request
 
-Once you have successfully built the package, you can start a pull request.
+Once you have successfully built the package, you can [start a pull request](https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/creating-a-pull-request).
 
 Most pull requests should only contain a single package and dependencies which are not part of void-packages yet.
 
 If you make updates to packages containing a soname bump, you also need to update `common/shlibs` and revbump all packages that are dependant.
 There should be a commit for each package revbump, and those commits should be part of the same pull request.
 
-When you make changes to your pull request, please *do not close and reopen your pull request*. Instead, just forcibly git push, overwriting any old commits. Closing and opening your pull requests repeatedly spams the Void maintainers.
+When you make changes to your pull request, please *do not close and reopen your pull request*. Instead, just [forcibly git push](#review), overwriting any old commits. Closing and opening your pull requests repeatedly spams the Void maintainers.
 
 #### Travis
 
@@ -101,6 +112,14 @@ We recommend having only a single commit for pull request, so if you need to mak
     $ git add <file>
     $ git commit --amend
     $ git push -f
+    
+A more powerful way of modifying commits than using `git commit --amend` is with [git-rebase](https://git-scm.com/docs/git-rebase#_interactive_mode), which allows you to join, reorder, change description of past commits and more.
+
+Alternatively, if there are issues with your git history, you can make another branch and push it to the existing PR:
+
+    $ git checkout master -b <attempt2>
+    $ # do changes anew
+    $ git push -f <fork> <attempt2>:<branch-of-pr>
 
 #### Closing the pull request
 
diff --git a/Manual.md b/Manual.md
index 5b49dc5ddd4..6c58c70709b 100644
--- a/Manual.md
+++ b/Manual.md
@@ -1991,22 +1991,17 @@ otherwise the `debug` packages won't have debugging symbols.
 <a id="contributing"></a>
 ### Contributing via git
 
-Fork the voidlinux `void-packages` git repository on github and clone it:
+To get started, [fork](https://help.github.com/articles/fork-a-repo) the void-linux `void-packages` git repository on GitHub and clone it:
 
     $ git clone git@github.com:<user>/void-packages.git
 
-See [CONTRIBUTING.md](./CONTRIBUTING.md) for information on how to format your
-commits and other tips for contributing.
-
-Once you've made changes to your `forked` repository you can submit
-a github pull request; see https://help.github.com/articles/fork-a-repo for more information.
-
-To keep your forked repository always up to date, setup the `upstream` remote
-to pull in new changes:
+To keep your forked repository 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 --rebase upstream master
 
+See [CONTRIBUTING.md](./CONTRIBUTING.md) for more information on how to contribute to `void-packages`.
+
 <a id="help"></a>
 ## Help
 

Re: Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[ericonr]

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/23788#issuecomment-663783834

Comment:
I think I dealt with all comments.

Re: [PR REVIEW] Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[Chocimier]

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

New review comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23788#discussion_r465188640

Comment:
This line is out of order and unnecessary, changes should be tested before submitting, as stated below. I see that this relates to following paragraph, but maybe reword that instead.

Re: Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[Chocimier]

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

New comment by Chocimier on void-packages repository

https://github.com/void-linux/void-packages/pull/23788#issuecomment-668707403

Comment:
> It should be concise summary of process, at least fork + mention of contributing.md + PR.

Please add mention on PR in Manual, either as was or some other form.

Re: [PR PATCH] [Closed]: Manual: move all git info to CONTRIB, explain how to use different branch in PR.

[ericonr]

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

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

Manual: move all git info to CONTRIB, explain how to use different branch in PR.
https://github.com/void-linux/void-packages/pull/23788

Description:
A little bit of reorganizing, and took @Chocimier's command from https://github.com/void-linux/void-packages/pull/23695#issuecomment-663226818