##// END OF EJS Templates
commit: improve --close-branch documentation...
Matt Mackall -
r25304:9bc11716 default
parent child Browse files
Show More
@@ -1080,7 +1080,9 b' def branch(ui, repo, label=None, **opts)'
1080 change.
1080 change.
1081
1081
1082 Use the command :hg:`update` to switch to an existing branch. Use
1082 Use the command :hg:`update` to switch to an existing branch. Use
1083 :hg:`commit --close-branch` to mark this branch as closed.
1083 :hg:`commit --close-branch` to mark this branch head as closed.
1084 When all heads of the branch are closed, the branch will be
1085 considered closed.
1084
1086
1085 Returns 0 on success.
1087 Returns 0 on success.
1086 """
1088 """
@@ -1418,7 +1420,7 b' def clone(ui, source, dest=None, **opts)'
1418 [('A', 'addremove', None,
1420 [('A', 'addremove', None,
1419 _('mark new/missing files as added/removed before committing')),
1421 _('mark new/missing files as added/removed before committing')),
1420 ('', 'close-branch', None,
1422 ('', 'close-branch', None,
1421 _('mark a branch as closed, hiding it from the branch list')),
1423 _('mark a branch head as closed')),
1422 ('', 'amend', None, _('amend the parent of the working directory')),
1424 ('', 'amend', None, _('amend the parent of the working directory')),
1423 ('s', 'secret', None, _('use the secret phase for committing')),
1425 ('s', 'secret', None, _('use the secret phase for committing')),
1424 ('e', 'edit', None, _('invoke editor on commit messages')),
1426 ('e', 'edit', None, _('invoke editor on commit messages')),
@@ -1444,6 +1446,10 b' def commit(ui, repo, *pats, **opts):'
1444 commit fails, you will find a backup of your message in
1446 commit fails, you will find a backup of your message in
1445 ``.hg/last-message.txt``.
1447 ``.hg/last-message.txt``.
1446
1448
1449 The --close-branch flag can be used to mark the current branch
1450 head closed. When all heads of a branch are closed, the branch
1451 will be considered closed and no longer listed.
1452
1447 The --amend flag can be used to amend the parent of the
1453 The --amend flag can be used to amend the parent of the
1448 working directory with a new commit that contains the changes
1454 working directory with a new commit that contains the changes
1449 in the parent in addition to those currently reported by :hg:`status`,
1455 in the parent in addition to those currently reported by :hg:`status`,
@@ -58,8 +58,7 b' help record (record)'
58
58
59 -A --addremove mark new/missing files as added/removed before
59 -A --addremove mark new/missing files as added/removed before
60 committing
60 committing
61 --close-branch mark a branch as closed, hiding it from the branch
61 --close-branch mark a branch head as closed
62 list
63 --amend amend the parent of the working directory
62 --amend amend the parent of the working directory
64 -s --secret use the secret phase for committing
63 -s --secret use the secret phase for committing
65 -e --edit invoke editor on commit messages
64 -e --edit invoke editor on commit messages
@@ -45,8 +45,7 b' Record help'
45
45
46 -A --addremove mark new/missing files as added/removed before
46 -A --addremove mark new/missing files as added/removed before
47 committing
47 committing
48 --close-branch mark a branch as closed, hiding it from the branch
48 --close-branch mark a branch head as closed
49 list
50 --amend amend the parent of the working directory
49 --amend amend the parent of the working directory
51 -s --secret use the secret phase for committing
50 -s --secret use the secret phase for committing
52 -e --edit invoke editor on commit messages
51 -e --edit invoke editor on commit messages
General Comments 0
You need to be logged in to leave comments. Login now