This mini series makes it so that --no-merges undoes --merges and vice versa, as the user should be able to expect, and that --merges-only is a separate option. Michael J Gruber (2): revision.c: rename --merges to --merges-only revision.c: introduce --merges to undo --no-merges Documentation/git-rev-list.txt | 1 + Documentation/git-stash.txt | 2 +- Documentation/rev-list-options.txt | 6 ++++-- contrib/completion/git-completion.bash | 2 +- revision.c | 4 +++- submodule.c | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) -- 1.7.4.1.464.gf81ff -- 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