Mercurial > hg
comparison tests/test-completion.t @ 23615:7cfe58983bff
backout: add --commit option
Mercurial backout command makes a commmit by default only when the backed out
revision is the parent of working directory and doesn't commit in any other
case.
The --commit option changes behaviour of backout to make a commit whenever
possible (i.e. there is no unresolved conflicts). This behaviour seems more
intuitive to many use (especially git users migrating to hg).
author | Mateusz Kwapich <mitrandir@fb.com> |
---|---|
date | Wed, 17 Dec 2014 17:26:12 -0800 |
parents | ccfb56450f21 |
children | 0390cc327dd5 |
comparison
equal
deleted
inserted
replaced
23614:cd79fb4d75fd | 23615:7cfe58983bff |
---|---|
215 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos, template | 215 status: all, modified, added, removed, deleted, clean, unknown, ignored, no-status, copies, print0, rev, change, include, exclude, subrepos, template |
216 summary: remote | 216 summary: remote |
217 update: clean, check, date, rev, tool | 217 update: clean, check, date, rev, tool |
218 addremove: similarity, subrepos, include, exclude, dry-run | 218 addremove: similarity, subrepos, include, exclude, dry-run |
219 archive: no-decode, prefix, rev, type, subrepos, include, exclude | 219 archive: no-decode, prefix, rev, type, subrepos, include, exclude |
220 backout: merge, parent, rev, edit, tool, include, exclude, message, logfile, date, user | 220 backout: merge, commit, parent, rev, edit, tool, include, exclude, message, logfile, date, user |
221 bisect: reset, good, bad, skip, extend, command, noupdate | 221 bisect: reset, good, bad, skip, extend, command, noupdate |
222 bookmarks: force, rev, delete, rename, inactive, template | 222 bookmarks: force, rev, delete, rename, inactive, template |
223 branch: force, clean | 223 branch: force, clean |
224 branches: active, closed, template | 224 branches: active, closed, template |
225 bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure | 225 bundle: force, rev, branch, base, all, type, ssh, remotecmd, insecure |