DOC: Rebase/squash instructions confusing

http://docs.astropy.org/en/latest/development/workflow/development_workflow.html

What I propose…

How to rebase

git fetch astropy master
git rebase astropy/master

(We should be consistent about naming the “upstream” remote, and it seems like astropy is the one to use from Double check your setup.)

How to squash

git rebase -i HEAD~n

where n is the number of commits to consider. For example, to squash last three commits into one, you would do git rebase -i HEAD~3, “pick” the first one on top, and “squash” the second and the third in the subsequent step involving an editor you set up to use with git.

cc @mcara

[bsipocz]

I would argue that it would be very much useful to spell out somehow that git pull is a command that should never be used during the rebase procedure. I finally got the exact recipe of how the usual rebase mistakes are created. Not sure where that idea comes from for that very common mistake (certainly not from these dev docs), but I suppose it wouldn’t hurt to emphasize that it’s not a command that needs to be done.

[pllim]

Hmm… 🤔