GitHub desired workflow...

[Joshua Root]

On 2016-11-1 08:46 , Lawrence Velázquez wrote:
>> On Oct 31, 2016, at 5:01 PM, Eric A. Borisch <eborisch at macports.org> wrote:
>>
>> 5) 'push' changes (to macports-ports)
>>
>> Oh, and and to capture upstream changes, somewhere after 1 and before
>> 5 (4? 3?),
>>
>> a) git fetch
>> b) git rebase origin/master
>> It looks like git pull --rebase does both of those, so that's not too
>> bad.
>
> That's the idea, although you'll have to do this with a clean working
> tree. That means committing or stashing your WIPs.

I'm using 'git pull --rebase --autostash' which does the stash-before 
and pop-after automatically.

- Josh