2.140.108

back to former pull style

rebase with autostash is too much of a club.  it did mash together things sort of nicely, but it obliterates the separate branch history and also seems to eat tags.  107 tag is there, supposedly, but i cannot see it in history, even after pull with tags.  still trying to figure out workflow.