Skip to content

Commit

Permalink
init (#488)
Browse files Browse the repository at this point in the history
  • Loading branch information
amalota authored Apr 9, 2022
1 parent ebbec55 commit 6657a28
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ci/checks/ensure-consistent-style-for-fork-point.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion completion/git-machete.completion.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/source/cli.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/source/cli_help/github.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Creates, checks out and manages GitHub PRs while keeping them reflected in branc

``checkout-prs [--all | --by=<github-login> | --mine | <PR-number-1> ... <PR-number-N>]``:

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.
Expand Down
4 changes: 2 additions & 2 deletions git_machete/docs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -348,7 +348,7 @@
<b>`checkout-prs [--all | --by=<github-login> | --mine | <PR-number-1> ... <PR-number-N>]`:</b>
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.
Expand Down

0 comments on commit 6657a28

Please sign in to comment.