Skip to content

Mpr fixes#3356

Merged
minrk merged 1 commit into
ipython:masterfrom
fperez:mpr-fixes
May 27, 2013
Merged

Mpr fixes#3356
minrk merged 1 commit into
ipython:masterfrom
fperez:mpr-fixes

Conversation

@fperez
Copy link
Copy Markdown
Member

@fperez fperez commented May 24, 2013

Create a branch for the merge, so it's easier to do local testing without having to constantly revert out of master.

Pinging @Carreau for input, since mpr was his...

without having to constantly revert out of master.
@Carreau
Copy link
Copy Markdown
Member

Carreau commented May 24, 2013

I actually think we could get rid of git mpr and use those instructions.

You can even push it a little further and tweek your .git/config (global or local) to have a shortcut for both the HEAD and MERGE commit if the PR is mergeable. And it is actually much more usefull than mpr because you can do all sort of things like diff master origin/pr/2543 or directly a checkout, or a rebase... etc.

@minrk
Copy link
Copy Markdown
Member

minrk commented May 27, 2013

I never use mpr, and do always just pull PRs directly from GitHub's refs, l but this seems like a straightforward improvement to an existing tool, so I'll go ahead and merge.

minrk added a commit that referenced this pull request May 27, 2013
git-mpr fixes

Create a branch for the merge, so it's easier to do local testing without having to constantly revert out of master.
@minrk minrk merged commit 686357b into ipython:master May 27, 2013
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
git-mpr fixes

Create a branch for the merge, so it's easier to do local testing without having to constantly revert out of master.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants