search

Skydio / revup

Effortlessly create and manage pull requests without changing branches. Powers a stacked diffs workflow with python and git "plumbing" commands.
https://github.com/Skydio/revup
MIT License
309 stars 59 forks source link

upload: Add "branch-format" config option and commit tag #168

Closed jerry-skydio closed 5 months ago

jerry-skydio commented 5 months ago

Branch-format will let you control how branches are named, which has an effect on when branches collide. This can be set on cmdline, from config file, or on a topic-by-topic basis inside the commit text.

user+branch is the default today and will remain the default. Branch names will never collide if using this, but you cannot retarget to other base branches, and you must use Uploader: if another user wants to push to this branch.

user allows retargeting prs to other base branches, but will not allow multiple base-branches to be specified. if they are, it will warn to specify user+branch instead.

branch will allow others to upload to the same pr, but uploader: cannot be used.

none includes both limitations and features of user and branch.

I don't really believe there's good use cases for branch and none, but i'm implementing them to be complete.

Fixes: #11

jerry-skydio commented 5 months ago

Reviews in this chain: └https://github.com/Skydio/revup/pull/168 upload: Add "branch-format" config option and commit tag

jerry-skydio commented 5 months ago
# head base diff date summary
0 1ed3dddc 1dd80d5e diff Mar 13 14:19 PM 4 files changed, 51 insertions(+), 7 deletions(-)