From: Daniel Dehennin <daniel.dehennin@baby-gnu.org>
To: ding@gnus.org
Subject: Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'
Date: Sat, 04 Jan 2014 22:40:14 +0100 [thread overview]
Message-ID: <87eh4no281.fsf@hati.baby-gnu.org> (raw)
In-Reply-To: <upzcvbxziyoh.fsf@dod.no> (Steinar Bang's message of "Sat, 04 Jan 2014 15:55:42 +0100")
[-- Attachment #1: Type: text/plain, Size: 1796 bytes --]
Steinar Bang <sb@dod.no> writes:
[...]
> HOWTO for adding these to gnus master:
> - Enter your git gnus clone
> cd ~/git/gnus
> - Add and fetch the baby-gnu gnus repo
> git remote add baby-gnu git://git.baby-gnu.net/gnus.git
> git fetch --tags baby-gnu
> git fetch baby-gnu
> - Update the gnus master branch to HEAD
> git checkout master
> git pull
> - Merge in the tag, and stop for inspection (magit is nice for looking
> at the merge results after this step, and also for fixing merge
> conflicts):
> git merge --no-ff --no-commit feature/use-gnus-parameters-in-gnus-group-split-fancy
> - After inspection and fix, either `c' to commit from inside magit, or
> commit on the command line:
> git commit
Hello,
When I need to make a merge for an occasional patch like this one, I'm
doing quite differently, I do not add the remote:
- I update the branch where the merge will go:
git checkout master && git pull
- If I'm feeling paranoid, I create a dedicated branch to test the
merge:
git checkout -b i master
- I just merge the tag with information given in the pull request:
git pull git://git.baby-gnu.net/gnus.git tags/feature/use-gnus-parameters-in-gnus-group-split-fancy
- In case of paranoid:
+ I edit the merge message to replace “i” by the real branch where I
want to merge
+ I merge the “i” branch in master, If I'm not happy with the merge, I
just trash the branch and ask for a reworked patch
- In non-paranoid case, if I'm not happy with the merge, I just reset
it (by resetting to “upstream” state):
git reset --hard @{u}
Regards.
--
Daniel Dehennin
Récupérer ma clef GPG:
gpg --keyserver pgp.mit.edu --recv-keys 0x7A6FE2DF
[-- Attachment #2: Type: application/pgp-signature, Size: 229 bytes --]
next prev parent reply other threads:[~2014-01-04 21:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-14 14:27 Daniel Dehennin
2013-12-28 1:17 ` Daniel Dehennin
2014-01-02 22:43 ` Daniel Dehennin
2014-01-04 14:55 ` Steinar Bang
2014-01-04 21:40 ` Daniel Dehennin [this message]
2014-01-05 5:13 ` Steinar Bang
2014-01-05 5:33 ` Daniel Dehennin
2014-01-05 13:03 ` Steinar Bang
2014-02-01 0:40 ` Lars Ingebrigtsen
2014-02-01 13:04 ` Daniel Dehennin
2014-02-01 20:39 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87eh4no281.fsf@hati.baby-gnu.org \
--to=daniel.dehennin@baby-gnu.org \
--cc=ding@gnus.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).