google / git-appraise

Distributed code review system for Git repos
Apache License 2.0
5.13k stars 146 forks source link

Make the submit strategy (fast-forward, merge, rebase, etc.) configurable #35

Closed ojarjur closed 8 years ago

ojarjur commented 8 years ago

The "submit" subcommand supports two flags (--merge and --rebase) for changing the way that merging is done (creating a merge bubble, rebasing the entire review, or defaulting to a fast-forward).

Having flags for this allows it to be selected per-review, but the expected scenario is that each project adopts a policy on which strategy to use, so it should be set once per repo instead of for each review.

For example, a user might want to run

git config --add appraise.submit 'merge'

And then have future calls to git appraise submit use the merge strategy by default.

We should also add a --fast-foward flag so that the user can override their per-repo configuration when submitting a review.