aboutsummaryrefslogtreecommitdiffstats
path: root/.github
diff options
context:
space:
mode:
authortcely <tcely@users.noreply.github.com>2019-03-07 13:26:48 -0500
committerNatanael Copa <ncopa@alpinelinux.org>2019-03-07 21:40:10 +0000
commitaf67727acaa834371dc990b173343e2a3ef298d6 (patch)
tree5c5fb529a0b8cd74627c3583b75aad8e19b909d2 /.github
parent4bb02b09003b63e5aa9c4d9be68117e15e663c00 (diff)
downloadaports-af67727acaa834371dc990b173343e2a3ef298d6.tar.gz
aports-af67727acaa834371dc990b173343e2a3ef298d6.tar.bz2
aports-af67727acaa834371dc990b173343e2a3ef298d6.tar.xz
Create remote-config-example.md
Provide some basic examples of using remotes to manipulate GitHub pull requests without a web browser.
Diffstat (limited to '.github')
-rw-r--r--.github/remote-config-example.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/.github/remote-config-example.md b/.github/remote-config-example.md
new file mode 100644
index 0000000000..20f8d6b2e3
--- /dev/null
+++ b/.github/remote-config-example.md
@@ -0,0 +1,14 @@
+Run `git config -e` and add the block below then run `git fetch --all` to update all the GitHub pull request branches.
+
+```
+[remote "github"]
+ url = https://github.com/alpinelinux/aports.git
+ fetch = +refs/heads/*:refs/remotes/github/*
+ fetch = +refs/pull/*:refs/remotes/github/pr/*
+```
+
+After you have done this you can merge / squash / rebase / cherry-pick from the command line.
+
+For example, `git rebase master github/pr/XXX/head; git checkout master` would migrate all the commits from PR #XXX.
+
+You can then push the results back to the "origin" remote which should be the official Alpine Linux aports repository.