[schacon]

The brand newest version of Git has a new `git backfill` command that may help with this.

https://git-scm.com/docs/git-backfill

[jakub_g]

Nice timing! Thanks!

[p_wood]

For rebasing `--reapply-cherry-picks` will avoid the annoying fetching you saw. `git backfill` is great for fetching the history of a file before running `git blame` on that file. I'm not sure how much it will help with detecting upstream cherry-picks.