All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ken Dreyer <kdreyer@redhat.com>
To: "ceph-devel@vger.kernel.org" <ceph-devel@vger.kernel.org>
Subject: Merging PRs on the command line
Date: Tue, 12 May 2015 15:58:09 -0600	[thread overview]
Message-ID: <55527771.6060401@redhat.com> (raw)

Hi Loic,

I was reading over some of the HOWTO docs in the wiki, and saw the steps
here:

http://tracker.ceph.com/projects/ceph-releases/wiki/HOWTO_populate_the_integration_branch

It looks like you're using curl to get the title of the PR, populating
the commit message, etc.

I've found that GitHub's "hub" utility is really great for simplifying
this. I typically merge PRs in GitHub by running the following in my
local clone:

  git checkout master
  git pull
  hub merge https://github.com/ceph/ceph/pull/4658
  git commit --amend (to add my "Reviewed-by" line to the merge commit)
  git push

The hub utility uses GitHub's APIs to automatically add a
non-fast-forward commit with a "regular" commit message that looks
more-or-less identical to the one that I'd get if I clicked the "Merge"
button in the web UI.

The thing that sold me on this is that all the merge commits are
authored by "kdreyer@redhat.com" instead of my personal email address. I
found that when I clicked the "Merge" button in GitHub's web UI, the
merge commits were authored by my primary email address for my
"ktdreyer" GitHub UID, which isn't really what I want for Ceph.

- Ken

             reply	other threads:[~2015-05-12 21:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-12 21:58 Ken Dreyer [this message]
2015-05-12 22:00 ` Merging PRs on the command line Mark Nelson
2015-05-12 22:09 ` Loic Dachary
2015-05-13  9:13 ` Joao Eduardo Luis

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=55527771.6060401@redhat.com \
    --to=kdreyer@redhat.com \
    --cc=ceph-devel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.