Mercurial > hg

annotate tests/bundles/rebase-revset.hg @ 27954:9960b6369e7f stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: disable --merge with --no-commit (issue4874) Because "backout --merge" have to make a commit before merging, it doesn't work with --no-commit. We could change "backout --merge" to make a merge commit automatically, and --no-commit to bypass a merge commit, but that change would be undesirable because: a) it's hard to fix bad merges in general b) two commits would be created with the same --message So, this patch simply disables "--merge --no-commit".
author Yuya Nishihara <yuya@tcha.org>
date Sat, 30 Jan 2016 18:00:11 +0900
parents 6cb6064f1d50
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15270
6cb6064f1d50 rebase: add --rev option to rebase
Pierre-Yves David <pierre-yves.david@ens-lyon.org>
parents:
diff changeset
1 (binary:application/octet-stream)