Adding support for Maildir and for setting user-agent.#32
Adding support for Maildir and for setting user-agent.#32andresmrm wants to merge 5 commits intowking:masterfrom
Conversation
Signed-off-by: Thibaut Girka <thib@sitedethib.com>
|
On Mon, Jun 30, 2014 at 07:04:52PM -0700, Andrés Martano wrote:
I'm still on the fence about the Maildir stuff, but these look good (and they'll fix this). Can you squash them into a single commit, add your Signed-off-by, and submit them as a separate PR? |
|
I can try, but I'm a bit lost about how to do it... |
|
On Tue, Dec 15, 2015 at 04:30:28PM -0800, Andrés Martano wrote:
No need for a new clone, just make a new branch. In a local rss2email $ git remote -v will list all of your remotes. You should have one for 1, but if $ git remote add andresmrm https://github.com/andresmrm/rss2email.git You'll also want a remote for this repo. If you don't have one $ git remote add wking https://github.com/wking/rss2email.git Fetch my current branches: $ git fetch wking Create a new branch off of my master: $ git checkout -b user-agent-config wking/master Pull in your original work, signing as you go: $ git cherry-pick -s b56cbd2 92a7b96 Squash them into a single commit: $ git rebase -i wking/master edit to replace ‘pick’ with ‘squash’ for “Allows setting user-agent $ git push andresmrm user-agent-config and create a pull request against my master from that branch. And let me know if you need more help with any particular part of that |
|
Wow! Thanks for all the help with Git. Helped a lot! =D |
|
@andresmrm The maildir part of this has been merged to https://github.com/rss2email/rss2email (new home of |
Maildir support was discussed here:
#21
Setting user-agent maybe good in some cases...
(Found a site that gives HTTP Error 403 if the user-agent contains the word "email"!!! I know, the site is wrong, but...)