diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-01-13 09:45:01 -0500 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2019-01-13 09:45:01 -0500 |
commit | f922c467e7a73c11f242a68b5dc1cef68bf13d6b (patch) | |
tree | 3d350a68d09cf678f4380060a6e3a59dc40417c7 | |
parent | dfb82537470750d1ace3b37af90e84010020c6a9 (diff) | |
download | sr.ht-docs-f922c467e7a73c11f242a68b5dc1cef68bf13d6b.tar.gz |
Update request-pull guide
-rw-r--r-- | git.sr.ht/send-email.md | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/git.sr.ht/send-email.md b/git.sr.ht/send-email.md index 2464176..6db5a29 100644 --- a/git.sr.ht/send-email.md +++ b/git.sr.ht/send-email.md @@ -122,23 +122,25 @@ for now. ## Using request-pull -Some maintainers may prefer to receive a "pull request", especially if you are -contributing a larger set of changes than can be easily managed in a handful of -patches. You should likely already be discussing your changes with the -maintainers, so make sure you are clear on their workflow preferences. - -To use this workflow you will need to have somewhere public to host your -modified copy of the git repository, such as right here on git.sr.ht. Add the -new remote: +For integrating large changesets, merging unrelated branches, or for maintainers +who prefer this workflow, you may want to use a "pull request". To use this +workflow you will need to have somewhere public to host your modified copy of +the git repository, like git.sr.ht. If you already have the upstream repository +cloned locally, take these steps to push your changes to your own git.sr.ht +repository: - git remote add myfork git@git.sr.ht:~me/myfork + git remote rename origin upstream + git remote add origin git@git.sr.ht:~yourname/some-project + git push -u origin master -Then generate the pull request: +Click the link to confirm the creation of your repository. Then generate the +pull request: - git request-pull -p [rev-spec...] myfork + git request-pull -p [rev-spec...] https://git.sr.ht/~yourname/some-project -You can copy-paste the output into your email client (remember to ensure you -are not sending HTML email) and add any timely commentary in front. +Take care to update the URLs in both of these commands. You can copy-paste the +output into your email client (remember to ensure you are not sending HTML +email) and add any timely commentary in front. ## Handling feedback |