Document and refuse rebase -s ours
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest3 patches 12 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/3 | Documentation: clarify 'ours' merge strategyDocumentation/ | +3 | 0 replies | |
| 2/3 | rebase docs: clarify --merge and --strategyDocumentation/ | +10 | 2 replies | |
| 3/3 | rebase: refuse to rebase with -s oursDocumentation/ git-rebase--interactive.sh git-rebase.sh | +10 | 8 replies |
Reviews trailers per patch
No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.
Cover letter [PATCH 0/3] Document and refuse rebase -s ours
Junio convinced me that it is not possible to limit the choice to only 'subtree', so here's a short series that implements the other changes I had already posted in diff form.
I also implemented Nicolas's suggestion to reject -s ours outright; I'm not really happy with starting a blacklist there, but maybe it helps the next unwary user. I split it because even if you reject 3/3, I think the first two should go in as extra documentation.
Thomas Rast (3):
Documentation: clarify 'ours' merge strategy
rebase docs: clarify --merge and --strategy
rebase: refuse to rebase with -s ours
Documentation/git-rebase.txt | 14 +++++++++++--- Documentation/merge-strategies.txt | 5 +++-- git-rebase--interactive.sh | 4 ++++ git-rebase.sh | 4 ++++ 4 files changed, 22 insertions(+), 5 deletions(-)