Gnus development mailing list
 help / color / mirror / Atom feed
From: Steinar Bang <sb@dod.no>
To: ding@gnus.org
Subject: Re: [PATCH] Use `gnus-parameters' in `gnus-group-split-fancy'
Date: Sun, 05 Jan 2014 14:03:19 +0100	[thread overview]
Message-ID: <87ppo68tt4.fsf@dod.no> (raw)
In-Reply-To: <877gafngat.fsf@hati.baby-gnu.org>

>>>>> Daniel Dehennin <daniel.dehennin@baby-gnu.org>:

> I should have missed something in my explanation, the paranoid part is
> optional,

Right! :-)

> I mostly do the pull directly in master:

> - pull master to be up-to-date against origin
> - pull the remote tag in master
> - if I do not like, juste “git reset --hard to HEAD~”

Which is simple and straightforward.

(On a side note I've found it useful to add actual copy/pastable
commands with all such instructions. That increases the likelyhood of
people actually following the instructions (I know the actual
instructions are two messages earlier in the thread, but people will not
necessarily go there, or if they do, spend time figuring out which of
those commands are the ones you list above). Git has so many
possibilities, it is best learnt "by absorption"... or at least: use it
a lot, then read the "Pro git" book)

My personal preference is to just leave the other remote hanging
around.  It does no harm, and I can study the branches there if I should
feel the urge.

I also prefer to work with branches, and almost(*) exclusively using
merge.

(*) I rebase/cherry-pick when taking changes back to old branches, and
    when I've messed up a "fake merge", and git insists that it won't
    merge because the target branch is alreayd up to date...




  reply	other threads:[~2014-01-05 13:03 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
2014-01-05  5:13       ` Steinar Bang
2014-01-05  5:33         ` Daniel Dehennin
2014-01-05 13:03           ` Steinar Bang [this message]
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=87ppo68tt4.fsf@dod.no \
    --to=sb@dod.no \
    --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).