linux-rdma.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jason Gunthorpe <jgg-uk2M96/98Pc@public.gmane.org>
To: Benjamin Drung <benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
Cc: Leon Romanovsky <leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>,
	linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: [PATCH rdma-core 0/3] Debian 15.1-1 changes
Date: Fri, 1 Dec 2017 11:28:06 -0700	[thread overview]
Message-ID: <20171201182806.GL7754@ziepe.ca> (raw)
In-Reply-To: <1512151985.9183.4.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>

On Fri, Dec 01, 2017 at 07:13:05PM +0100, Benjamin Drung wrote:
> GitHub does not allow to rebase & merge the pull request. Is there any
> reason to not allow the rebase & merge workflow? My commits are atomic
> and the git history is cleaner without the merge commits.

We have been using the merge workflow. I'm not sure this was every
really discussed which is best or not.

The git history is simpler with rebase, but merge preserves the 'what
did I test' and preserves the series boundaries, which are also useful things.

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

  parent reply	other threads:[~2017-12-01 18:28 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-11-30 12:39 [PATCH rdma-core 0/3] Debian 15.1-1 changes Benjamin Drung
     [not found] ` <20171130123940.25795-1-benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2017-11-30 12:39   ` [PATCH rdma-core 1/3] debian: Add m68k as non-coherent DMA architecture Benjamin Drung
2017-11-30 12:39   ` [PATCH rdma-core 2/3] debian: Mark libraries as Multi-Arch: same Benjamin Drung
2017-11-30 12:39   ` [PATCH rdma-core 3/3] debian: Update changelog to include Debian uploads Benjamin Drung
2017-11-30 17:47   ` [PATCH rdma-core 0/3] Debian 15.1-1 changes Jason Gunthorpe
     [not found]     ` <20171130174750.GD7754-uk2M96/98Pc@public.gmane.org>
2017-11-30 18:21       ` Benjamin Drung
     [not found]         ` <1512066118.4246.2.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2017-11-30 18:58           ` Jason Gunthorpe
     [not found]             ` <20171130185822.GE7754-uk2M96/98Pc@public.gmane.org>
2017-11-30 22:09               ` Benjamin Drung
     [not found]                 ` <1512079788.3878.1.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2017-12-01  5:57                   ` Leon Romanovsky
     [not found]                     ` <20171201055732.GC8126-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
2017-12-01 18:13                       ` Benjamin Drung
     [not found]                         ` <1512151985.9183.4.camel-EIkl63zCoXaH+58JC4qpiA@public.gmane.org>
2017-12-01 18:28                           ` Jason Gunthorpe [this message]
     [not found]                             ` <20171201182806.GL7754-uk2M96/98Pc@public.gmane.org>
2017-12-02  8:40                               ` Leon Romanovsky
     [not found]                                 ` <20171202084019.GG8126-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
2017-12-02 16:28                                   ` Jason Gunthorpe
     [not found]                                     ` <20171202162856.GA28143-uk2M96/98Pc@public.gmane.org>
2017-12-03  6:55                                       ` Leon Romanovsky
     [not found]                                         ` <20171203065501.GA2110-U/DQcQFIOTAAJjI8aNfphQ@public.gmane.org>
2017-12-03 16:27                                           ` Jason Gunthorpe
     [not found]                                             ` <20171203162704.GA8566-uk2M96/98Pc@public.gmane.org>
2017-12-04  4:33                                               ` Leon Romanovsky

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=20171201182806.GL7754@ziepe.ca \
    --to=jgg-uk2m96/98pc@public.gmane.org \
    --cc=benjamin.drung-EIkl63zCoXaH+58JC4qpiA@public.gmane.org \
    --cc=leon-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \
    --cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.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).