All of lore.kernel.org
 help / color / mirror / Atom feed
From: Florian Lindner <mailinglists@xgm.de>
To: git@vger.kernel.org
Subject: GitHub Pull Request merge commands
Date: Tue, 16 Jun 2015 10:55:07 +0200	[thread overview]
Message-ID: <mloo9l$agl$6@ger.gmane.org> (raw)

Hello,

GitHub proposes these commands to merge a pull requests (explanations from 
me, to make sure I got it correctly)

# Basically branch develop to davidsblom-develop
git checkout -b davidsblom-develop develop

# Pull in foreign repos commits from foreign develop branch.
git pull git://github.com/davidsblom/precice.git develop

# Edit and merge the changes to the main repos develop branch
git checkout develop
git merge --no-ff davidsblom-develop
git push origin develop

My question is, if davidsblom make further commits to his develop branch 
(after the pull request was issued) aren't these commits also included in 
the pull and therefore in the merge? If yes, isn't the idea to merge just 
the changes that the pull request was about? If not, why? ;-)

Thanks,
Florian

             reply	other threads:[~2015-06-16  9:20 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-16  8:55 Florian Lindner [this message]
2015-06-16  9:33 ` GitHub Pull Request merge commands Johannes Löthberg

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='mloo9l$agl$6@ger.gmane.org' \
    --to=mailinglists@xgm.de \
    --cc=git@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.