Skip to content

tools: tool to sync upstream master with local

Rodrigo Muino Tomonari requested to merge github/fork/krydos/sync-upstream into master

Hi :) I have script that just runs git fetch... && git rebase... for master so I should not do this manually all the time. Just wondering if it can be useful for someone. I've changed it a bit to be more "smart" than just git fetch... && git rebase and added make target also. Please update me if it can be useful for you. Or if it is completely not useful and makes no sense so I'll go sad in the sunset.

Just a bit more info about how it works. It doesn't matter what branch you're currently on and what changes you've already made. It checks if worktree is dirty and do git stash. Then checkouts to master, updates it and goes back to your previous branch and runs git stash pop.

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)

tools

Merge request reports

Loading