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(-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html