Skip to content

Commit

Permalink
Issue #711: Update docs with information that flag order defines thei…
Browse files Browse the repository at this point in the history
…r precedence over each other (#718)
  • Loading branch information
amalota authored Nov 4, 2022
1 parent e0c57f9 commit e069b82
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion docs/enforce-docs-up-to-date.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ current_docs=$(<git_machete/generated_docs.py)
generated_docs=$(python docs/generate_py_docs.py)

if [[ "$current_docs" != "$generated_docs" ]]; then
echo "Command line docs are not up-to-date. Please regenerate docs via tox -e py-docs"
echo "Command line docs are not up-to-date. Please regenerate docs via 'tox -e py-docs'"
exit 1
fi
4 changes: 4 additions & 0 deletions docs/source/cli_help/traverse.rst
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ For each branch, the command:

- prints the updated ``status``.

By default ``traverse`` asks if the branch should be pushed, this behaviour can, however, be changed with the ``machete.traverse.push`` configuration key.
It can also be customized using options: ``--[no-]push`` or ``--[no-]push-untracked`` --- the order of the flags defines their precedence over each other
(the one on the right overriding the ones on the left). More on them in the **Options** section below.

If the traverse flow is stopped (typically due to merge/rebase conflicts), just run ``git machete traverse`` after the merge/rebase is finished.
It will pick up the walk from the current branch (unless ``--start-from=`` or ``-w`` etc. is passed).
Unlike with e.g. ``git rebase``, there is no special ``--continue`` flag, as ``traverse`` is stateless
Expand Down
4 changes: 4 additions & 0 deletions git_machete/generated_docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -957,6 +957,10 @@
* and finally, if any of the above operations has been successfully completed:
- prints the updated `status`.
By default `traverse` asks if the branch should be pushed, this behaviour can, however, be changed with the `machete.traverse.push` configuration key.
It can also be customized using options: `--[no-]push` or `--[no-]push-untracked` — the order of the flags defines their precedence over each other
(the one on the right overriding the ones on the left). More on them in the <b>Options</b> section below.
If the traverse flow is stopped (typically due to merge/rebase conflicts), just run `git machete traverse` after the merge/rebase is finished.
It will pick up the walk from the current branch (unless `--start-from=` or `-w` etc. is passed).
Unlike with e.g. `git rebase`, there is no special `--continue` flag, as `traverse` is stateless
Expand Down

0 comments on commit e069b82

Please sign in to comment.