##// END OF EJS Templates
write options in "-r/--rev" style in help texts
Martin Geisler -
r8277:b9403042 default
parent child Browse files
Show More
@@ -17,7 +17,7 b' def children(ui, repo, file_=None, **opt'
17 """show the children of the given or working directory revision
17 """show the children of the given or working directory revision
18
18
19 Print the children of the working directory's revisions. If a
19 Print the children of the working directory's revisions. If a
20 revision is given via --rev/-r, the children of that revision will
20 revision is given via -r/--rev, the children of that revision will
21 be printed. If a file argument is given, revision in which the
21 be printed. If a file argument is given, revision in which the
22 file was last changed (after the working directory revision or the
22 file was last changed (after the working directory revision or the
23 argument to --rev if given) is printed.
23 argument to --rev if given) is printed.
@@ -2667,7 +2667,8 b' def serve(ui, repo, **opts):'
2667 Start a local HTTP repository browser and pull server.
2667 Start a local HTTP repository browser and pull server.
2668
2668
2669 By default, the server logs accesses to stdout and errors to
2669 By default, the server logs accesses to stdout and errors to
2670 stderr. Use the -A and -E options to log to files.
2670 stderr. Use the -A/--accesslog and -E/--errorlog options to log to
2671 files.
2671 """
2672 """
2672
2673
2673 if opts["stdio"]:
2674 if opts["stdio"]:
@@ -2939,16 +2940,16 b' def update(ui, repo, node=None, rev=None'
2939 the working directory will additionally be switched to that
2940 the working directory will additionally be switched to that
2940 branch.
2941 branch.
2941
2942
2942 When there are uncommitted changes, use option -C to discard them,
2943 When there are uncommitted changes, use option -C/--clean to
2943 forcibly replacing the state of the working directory with the
2944 discard them, forcibly replacing the state of the working
2944 requested revision.
2945 directory with the requested revision.
2945
2946
2946 When there are uncommitted changes and option -C is not used, and
2947 When there are uncommitted changes and option -C/--clean is not
2947 the parent revision and requested revision are on the same branch,
2948 used, and the parent revision and requested revision are on the
2948 and one of them is an ancestor of the other, then the new working
2949 same branch, and one of them is an ancestor of the other, then the
2949 directory will contain the requested revision merged with the
2950 new working directory will contain the requested revision merged
2950 uncommitted changes. Otherwise, the update will fail with a
2951 with the uncommitted changes. Otherwise, the update will fail with
2951 suggestion to use 'merge' or 'update -C' instead.
2952 a suggestion to use 'merge' or 'update -C' instead.
2952
2953
2953 If you want to update just one file to an older revision, use
2954 If you want to update just one file to an older revision, use
2954 revert.
2955 revert.
General Comments 0
You need to be logged in to leave comments. Login now