Duy Nguyen <pclo...@gmail.com> writes: > OK. Just to be sure we're on the same page. Am I waiting for all > config changes to land in 'master', or do I rebase my series on > 'next'? I usually base on 'master' but the mention of 'next' here > confuses me a bit.
I was hoping that you can do something like: $ git fetch https://github.com/gitster/git \ --refmap=refs/heads/*:refs/remotes/broken-out/* \ bp/reset-quiet master $ git checkout broken-out/master^0 $ git merge broekn-out/bp/reset-quiet $ git rebase HEAD np/config-split once it is clear to everybody that Ben's reset series is ready to be merged to 'next' (or it actually hits 'next').
