diff --git a/ci/checks/ensure-consistent-style-for-fork-point.sh b/ci/checks/ensure-consistent-style-for-fork-point.sh index b1a37a7e0..473ff78f2 100755 --- a/ci/checks/ensure-consistent-style-for-fork-point.sh +++ b/ci/checks/ensure-consistent-style-for-fork-point.sh @@ -5,6 +5,6 @@ set -e -o pipefail -u self_dir=$(cd "$(dirname "$0")" &>/dev/null; pwd -P) source "$self_dir"/utils.sh -if git grep -we forkpoint -we Forkpoint -- :^ci/checks/ensure-consistent-style-for-fork-point.sh; then +if git grep '[fF]orkpoint' -- :^ci/checks/ensure-consistent-style-for-fork-point.sh; then die "Please use 'fork point' or 'Fork point' or 'fork_point' instead of 'forkpoint' or 'Forkpoint'." fi diff --git a/completion/git-machete.completion.bash b/completion/git-machete.completion.bash index c03ca31b3..857337261 100644 --- a/completion/git-machete.completion.bash +++ b/completion/git-machete.completion.bash @@ -48,7 +48,7 @@ _git_machete() { delete-unmanaged) __gitcomp "$common_opts $delete_unmanaged_opts" ;; discover) __gitcomp "$common_opts $discover_opts" ;; fork-point) __gitcomp "$common_opts $fork_point_opts" ;; - github) # TODO (#393): Add support in zsh and bash completion for options of `git machete github checkout-prs` + github) if [[ ${COMP_WORDS[3]} == "create-pr" ]]; then __gitcomp "$common_opts $github_create_pr_opts" elif [[ ${COMP_WORDS[3]} == "checkout-prs" ]]; then diff --git a/docs/source/cli.rst b/docs/source/cli.rst index 7b41b1de3..168b7cd46 100644 --- a/docs/source/cli.rst +++ b/docs/source/cli.rst @@ -12,7 +12,7 @@ git machete commands and help topics: * :ref:`add` -- Add a branch to the tree of branch dependencies. * :ref:`advance` -- Fast-forward merge one of children to the current branch and then slide out this child * :ref:`anno` -- Manage custom annotations -* :ref:`clean` -- Delete untracked managed branches with no downstream branch, delete unmanaged branches and also checkout open PRs for the current user associated with the GitHub token +* :ref:`clean` -- Delete untracked and unmanaged branches and also optionally check out user's open GitHub PRs * :ref:`delete-unmanaged` -- Delete local branches that are not present in the definition file * :ref:`diff` -- Diff current working directory or a given branch against its computed fork point * :ref:`discover` -- Automatically discover tree of branch dependencies diff --git a/docs/source/cli_help/github.rst b/docs/source/cli_help/github.rst index 12402373c..10efed2ff 100644 --- a/docs/source/cli_help/github.rst +++ b/docs/source/cli_help/github.rst @@ -22,7 +22,7 @@ Creates, checks out and manages GitHub PRs while keeping them reflected in branc ``checkout-prs [--all | --by= | --mine | ... ]``: - Check out the head branch of the given pull requests (specified by number), + Check out the head branch of the given pull requests (specified by numbers or by a flag), also traverse chain of pull requests upwards, adding branches one by one to git-machete and check them out locally. Once the specified pull requests are checked out locally, annotate local branches with corresponding pull request numbers. If only one PR has been checked out, then switch the local repository's HEAD to its head branch. diff --git a/git_machete/docs.py b/git_machete/docs.py index dcb361ff7..7167dfab5 100644 --- a/git_machete/docs.py +++ b/git_machete/docs.py @@ -5,7 +5,7 @@ "add": "Add a branch to the tree of branch dependencies", "advance": "Fast-forward merge one of children to the current branch and then slide out this child", "anno": "Manage custom annotations", - "clean": "Delete untracked and unmanaged branches and also check out user's open GitHub PRs", + "clean": "Delete untracked and unmanaged branches and also optionally check out user's open GitHub PRs", "delete-unmanaged": "Delete local branches that are not present in the definition file", "diff": "Diff current working directory or a given branch against its computed fork point", "discover": "Automatically discover tree of branch dependencies", @@ -348,7 +348,7 @@ `checkout-prs [--all | --by= | --mine | ... ]`: - Check out the head branch of the given pull requests (specified by number), + Check out the head branch of the given pull requests (specified by numbers or by a flag), also traverse chain of pull requests upwards, adding branches one by one to git-machete and check them out locally. Once the specified pull requests are checked out locally, annotate local branches with corresponding pull request numbers. If only one PR has been checked out, then switch the local repository's HEAD to its head branch.