[Concept] [PATCH v2 0/2] pickman: Improve handling of rebasing