Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 6385:0d4e068e9e52

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: when committing the results of a merge, it's all or nothing Previously, it was possible to commit just one file from a merge, which is essentially always the wrong thing to do. This fixes issue 1049.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 24 Mar 2008 15:36:56 -0700
parents cdc458b12f0f
children b8346ae5d64b fb374b1b3911
comparison
equal deleted inserted replaced
6384:8bc876e03143 6385:0d4e068e9e52
536 536
537 Commit changes to the given files into the repository. 537 Commit changes to the given files into the repository.
538 538
539 If a list of files is omitted, all changes reported by "hg status" 539 If a list of files is omitted, all changes reported by "hg status"
540 will be committed. 540 will be committed.
541
542 If you are committing the result of a merge, do not provide any
543 file names or -I/-X filters.
541 544
542 If no commit message is specified, the configured editor is started to 545 If no commit message is specified, the configured editor is started to
543 enter a message. 546 enter a message.
544 547
545 See 'hg help dates' for a list of formats valid for -d/--date. 548 See 'hg help dates' for a list of formats valid for -d/--date.