[core-workflow] What instructions to give for squashing PRs from the CLI?

[Oleg Broytman]

On Thu, Oct 06, 2016 at 07:43:21PM +0000, Brett Cannon <brett at snarky.ca> wrote:
> While we will use GitHub's Squash and Merge button for PRs, that doesn't
> meant everyone will want to use it; some people just prefer using a CLI.
> That means we need to come up with a set of instructions on how to take a
> GitHub PR and perform a squash commit manually at the CLI (committing a
> patch from bugs.python.org is simply since there's no squashing to do).
> Anyone have that set of commands handy?

It's something like::

    $ git fetch github pull/$ID/head:$BRANCHNAME
    $ git checkout master
    $ git merge --squash $BRANCHNAME
    $ git branch -d $BRANCHNAME

Oleg.
-- 
     Oleg Broytman            http://phdru.name/            phd at phdru.name
           Programmers don't die, they just GOSUB without RETURN.