Skip to content
Snippets Groups Projects
Commit 1856de4d authored by muxator's avatar muxator
Browse files

update: mention long options explicitly in description of merge.update()

The short options "-c" and "-C" may be confusing for a novice reading the
documentation. Let's try to be more explicit, also mentioning the equivalent
long options ("--check" and "--clean") in the comments.
parent 27481162
No related branches found
No related tags found
No related merge requests found
......@@ -1727,11 +1727,11 @@
mergeforce = whether the merge was run with 'merge --force' (deprecated): if
this is True, then 'force' should be True as well.
The table below shows all the behaviors of the update command
given the -c and -C or no options, whether the working directory
is dirty, whether a revision is specified, and the relationship of
the parent rev to the target rev (linear or not). Match from top first. The
-n option doesn't exist on the command line, but represents the
The table below shows all the behaviors of the update command given the
-c/--check and -C/--clean or no options, whether the working directory is
dirty, whether a revision is specified, and the relationship of the parent
rev to the target rev (linear or not). Match from top first. The -n
option doesn't exist on the command line, but represents the
experimental.updatecheck=noconflict option.
This logic is tested by test-update-branches.t.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment