git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Philippe Vaucher <philippe.vaucher@gmail.com>
To: in-gitvger@baka.org
Cc: Duane Murphy <duanemurphy@mac.com>, git@vger.kernel.org
Subject: Re: Pull --rebase looses merge information
Date: Fri, 7 Oct 2011 08:46:34 +0200	[thread overview]
Message-ID: <CAGK7Mr5K63s78nt+UBC45_Ec1v-yfQMQK6+Wb-itu_rJHVPDgw@mail.gmail.com> (raw)
In-Reply-To: <201110062031.p96KVvsv018248@no.baka.org>

> I personally believe all pull should be --rebase, all merges should be
> --no-ff, and all rebases should be -p.  At least by default.  But that
> is just me.

+1

Philippe

      reply	other threads:[~2011-10-07  6:47 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-10-06 19:21 Pull --rebase looses merge information Duane Murphy
2011-10-06 20:31 ` in-gitvger
2011-10-07  6:46   ` Philippe Vaucher [this message]

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=CAGK7Mr5K63s78nt+UBC45_Ec1v-yfQMQK6+Wb-itu_rJHVPDgw@mail.gmail.com \
    --to=philippe.vaucher@gmail.com \
    --cc=duanemurphy@mac.com \
    --cc=git@vger.kernel.org \
    --cc=in-gitvger@baka.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).