PyPI - git-machete - Versions diffs - 3.40.0__tar.gz → 3.41.0__tar.gz - Mend

git-machete 3.40.0tar.gz → 3.41.0tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (71) hide show

{git_machete-3.40.0/git_machete.egg-info → git_machete-3.41.0}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-machete
-Version: 3.40.0
+Version: 3.41.0
 Summary: Probably the sharpest git repository organizer & rebase/merge workflow automation tool you've ever seen
 Home-page: https://github.com/VirtusLab/git-machete
 Author: VirtusLab

{git_machete-3.40.0 → git_machete-3.41.0}/completion/git-machete.completion.bash RENAMED Viewed

@@ -1,7 +1,51 @@
 #!/usr/bin/env bash
+# Check if any of the given options appear in the current command line words.
+# Usage: _git_machete_seen_opt --opt1 -o --opt2 ...
+_git_machete_seen_opt() {
+  local opt
+  for opt in "$@"; do
+    local word
+    for word in "${COMP_WORDS[@]}"; do
+      # Handle options with = (e.g. --onto= matches --onto=* and --onto)
+      if [[ "$opt" == *"=" ]]; then
+        if [[ "$word" == "${opt%=}" || "$word" == "${opt}"* ]]; then
+          return 0
+        fi
+      else
+        if [[ "$word" == "$opt" ]]; then
+          return 0
+        fi
+      fi
+    done
+  done
+  return 1
+}
+# Apply mutual exclusion to a space-separated options string.
+# Each subsequent argument is a mutually-exclusive group of options (space-separated).
+# If any option in a group is present on the current command line,
+# all options from that group are removed from the resulting string.
+# Usage: result=$(_git_machete_filter_mutex_groups "<opts>" "<group1>" "<group2>" ...)
+_git_machete_filter_mutex_groups() {
+  local opts=" $1 "
+  shift
+  local group
+  for group in "$@"; do
+    if _git_machete_seen_opt $group; then
+      local opt
+      for opt in $group; do
+        opts="${opts// $opt / }"
+      done
+    fi
+  done
+  opts="${opts# }"
+  opts="${opts% }"
+  echo "$opts"
+}
 _git_machete() {
-  local cmds="add advance anno completion delete-unmanaged diff discover edit file fork-point github gitlab go help is-managed list log reapply show slide-out squash status traverse update version"
+  local cmds="add advance anno completion delete-unmanaged diff discover edit file fork-point github gitlab go help is-managed list log reapply rename show slide-out squash status traverse update version"
   local help_topics="$cmds config format hooks"
   local categories="addable childless managed slidable slidable-after unmanaged with-overridden-fork-point"
@@ -11,6 +55,7 @@ _git_machete() {
   local locations="current $directions"
   local opt_color_args="always auto never"
   local opt_return_to_args="HERE NEAREST-REMAINING STAY"
+  local opt_squash_merge_detection_args="exact none simple"
   local opt_start_from_args="HERE ROOT FIRST-ROOT"
   local shells="bash fish zsh"
@@ -21,7 +66,7 @@ _git_machete() {
   local delete_unmanaged_opts="-y --yes"
   local diff_opts="-s --stat"
   local discover_opts="-C --checked-out-since= -l --list-commits -r --roots= -y --yes"
-  local fork_point_opts="--inferred --override-to= --override-to-inferred --override-to-parent --unset-override"
+  local fork_point_opts="--explain --inferred --override-to= --override-to-inferred --override-to-parent --unset-override"
   local githublab_anno_opts="--with-urls"
   local githublab_create_opts="--draft --title= -U --update-related-descriptions -y --yes"
   local githublab_checkout_opts="--all --by= --mine"
@@ -29,10 +74,11 @@ _git_machete() {
   local githublab_retarget_opts="-b --branch= --ignore-if-missing -U --update-related-descriptions"
   local githublab_update_descriptions_opts="--all --by= --mine --related"
   local reapply_opts="-f --fork-point="
+  local rename_opts="-b --branch= --repoint-tracking"
   local slide_out_opts="-d --down-fork-point= --delete -M --merge -n --no-edit-merge --no-interactive-rebase --no-rebase --removed-from-remote"
   local squash_opts="-f --fork-point="
-  local status_opts="--color= -L --list-commits-with-hashes -l --list-commits --no-detect-squash-merges"
-  local traverse_opts="-F --fetch -H --sync-github-prs -L --sync-gitlab-mrs -l --list-commits -M --merge -n --no-detect-squash-merges --no-edit-merge --no-interactive-rebase --no-push --no-push-untracked --push --push-untracked --return-to= --start-from= --stop-after= -w --whole -W -y --yes"
+  local status_opts="--color= -L --list-commits-with-hashes -l --list-commits --no-detect-squash-merges --squash-merge-detection="
+  local traverse_opts="-F --fetch -H --sync-github-prs -L --sync-gitlab-mrs -l --list-commits -M --merge -n --no-detect-squash-merges --no-edit-merge --no-interactive-rebase --no-push --no-push-untracked --push --push-untracked --return-to= --squash-merge-detection= --start-from= --stop-after= -w --whole -W -y --yes"
   local update_opts="-f --fork-point= -M --merge -n --no-edit-merge --no-interactive-rebase"
   cur=${COMP_WORDS[$COMP_CWORD]}
@@ -43,17 +89,35 @@ _git_machete() {
     --down-fork-point=*|--fork-point=*|--override-to=*) __gitcomp "$(__git_refs)" "" "${cur##--*=}" ;;
     --return-to=*) __gitcomp "$opt_return_to_args" "" "${cur##--return-to=}" ;;
     --roots=*) __gitcomp "$(__git_heads)" "" "${cur##--roots=}" ;;
+    --squash-merge-detection=*) __gitcomp "$opt_squash_merge_detection_args" "" "${cur##--squash-merge-detection=}" ;;
     --start-from=*) __gitcomp "$opt_start_from_args $(__git_heads)" "" "${cur##--start-from=}" ;;
     --stop-after=*) __gitcomp "$(__git_heads)" "" "${cur##--stop-after=}" ;;
     -*)
       case ${COMP_WORDS[2]} in
-        add) __gitcomp "$common_opts $add_opts" ;;
+        add)
+          local filtered_add_opts
+          filtered_add_opts=$(_git_machete_filter_mutex_groups "$add_opts" \
+            "-R --as-root -f --as-first-child" \
+            "-R --as-root -o --onto=")
+          __gitcomp "$common_opts $filtered_add_opts"
+          ;;
         advance) __gitcomp "$common_opts $advance_opts" ;;
-        anno) __gitcomp "$common_opts $anno_opts" ;;
+        anno)
+          local filtered_anno_opts
+          filtered_anno_opts=$(_git_machete_filter_mutex_groups "$anno_opts" \
+            "-H --sync-github-prs -L --sync-gitlab-mrs")
+          __gitcomp "$common_opts $filtered_anno_opts"
+          ;;
         d|diff) __gitcomp "$common_opts $diff_opts" ;;
         delete-unmanaged) __gitcomp "$common_opts $delete_unmanaged_opts" ;;
         discover) __gitcomp "$common_opts $discover_opts" ;;
-        fork-point) __gitcomp "$common_opts $fork_point_opts" ;;
+        fork-point)
+          local filtered_fork_point_opts
+          filtered_fork_point_opts=$(_git_machete_filter_mutex_groups "$fork_point_opts" \
+            "--inferred --override-to= --override-to-inferred --override-to-parent --unset-override" \
+            "--explain --override-to= --override-to-inferred --override-to-parent --unset-override")
+          __gitcomp "$common_opts $filtered_fork_point_opts"
+          ;;
         github)
           case ${COMP_WORDS[3]} in
             "anno-prs") __gitcomp "$common_opts $githublab_anno_opts" ;;
@@ -75,11 +139,52 @@ _git_machete() {
             *) __gitcomp "$common_opts" ;;
           esac ;;
         reapply) __gitcomp "$common_opts $reapply_opts" ;;
-        slide-out) __gitcomp "$common_opts $slide_out_opts" ;;
+        rename) __gitcomp "$common_opts $rename_opts" ;;
+        slide-out)
+          local filtered_slide_out_opts
+          filtered_slide_out_opts=$(_git_machete_filter_mutex_groups "$slide_out_opts" \
+            "--removed-from-remote -d --down-fork-point=" \
+            "--removed-from-remote -M --merge" \
+            "--removed-from-remote -n" \
+            "--removed-from-remote --no-edit-merge" \
+            "--removed-from-remote --no-interactive-rebase" \
+            "--removed-from-remote --no-rebase" \
+            "-M --merge -d --down-fork-point=" \
+            "-M --merge --no-interactive-rebase" \
+            "-M --merge --no-rebase" \
+            "-n --no-edit-merge" \
+            "-n --no-interactive-rebase" \
+            "--no-rebase -d --down-fork-point=" \
+            "--no-rebase --no-edit-merge" \
+            "--no-rebase --no-interactive-rebase")
+          __gitcomp "$common_opts $filtered_slide_out_opts"
+          ;;
         squash) __gitcomp "$common_opts $squash_opts" ;;
         s|status) __gitcomp "$common_opts $status_opts" ;;
-        t|traverse) __gitcomp "$common_opts $traverse_opts" ;;
-        update) __gitcomp "$common_opts $update_opts" ;;
+        t|traverse)
+          local filtered_traverse_opts
+          filtered_traverse_opts=$(_git_machete_filter_mutex_groups "$traverse_opts" \
+            "-W -F --fetch" \
+            "-W -l --list-commits" \
+            "-W -w --whole" \
+            "-H --sync-github-prs -L --sync-gitlab-mrs" \
+            "-M --merge --no-interactive-rebase" \
+            "-n --no-edit-merge" \
+            "-n --no-interactive-rebase" \
+            "-n -y --yes" \
+            "--push --no-push" \
+            "--push-untracked --no-push-untracked")
+          __gitcomp "$common_opts $filtered_traverse_opts"
+          ;;
+        update)
+          local filtered_update_opts
+          filtered_update_opts=$(_git_machete_filter_mutex_groups "$update_opts" \
+            "-M --merge -f --fork-point=" \
+            "-M --merge --no-interactive-rebase" \
+            "-n --no-edit-merge" \
+            "-n --no-interactive-rebase")
+          __gitcomp "$common_opts $filtered_update_opts"
+          ;;
         *)
           if [[ $COMP_CWORD -eq 2 ]]; then
             __gitcomp "$common_opts --version"
@@ -108,6 +213,7 @@ _git_machete() {
           --return-to) __gitcomp "$opt_return_to_args" ;;
           # TODO (#111): complete the comma-separated list of roots
           -r|--roots) __gitcomp "$(__git_heads)" ;;
+          --squash-merge-detection) __gitcomp "$opt_squash_merge_detection_args" ;;
           --start-from) __gitcomp "$opt_start_from_args $(__git_heads)" ;;
           --stop-after) __gitcomp "$(__git_heads)" ;;
           --unset-override) __gitcomp_nl "$(git machete list with-overridden-fork-point 2>/dev/null)" ;;

{git_machete-3.40.0 → git_machete-3.41.0}/completion/git-machete.completion.zsh RENAMED Viewed

@@ -19,9 +19,9 @@ _git-machete() {
         (add)
           _arguments \
             '1:: :__git_machete_list_addable' \
-            '(-f --as-first-child)'{-f,--as-first-child}'[Add the given branch as the first (instead of last) child of its parent]' \
-            '(-R --as-root)'{-R,--as-root}'[Add the given branch as a new root]' \
-            '(-o --onto)'{-o,--onto=}'[Specify the target parent branch to add the given branch onto]: :__git_machete_list_managed' \
+            '(-R --as-root -f --as-first-child)'{-f,--as-first-child}'[Add the given branch as the first (instead of last) child of its parent]' \
+            '(-R --as-root -f --as-first-child -o --onto)'{-R,--as-root}'[Add the given branch as a new root]' \
+            '(-R --as-root -o --onto)'{-o,--onto=}'[Specify the target parent branch to add the given branch onto]: :__git_machete_list_managed' \
             '(-y --yes)'{-y,--yes}'[Do not ask for confirmation whether to create the branch or whether to add onto the inferred upstream]' \
             "${common_flags[@]}"
           ;;
@@ -33,8 +33,8 @@ _git-machete() {
         (anno)
           _arguments \
             '(-b --branch)'{-b,--branch=}'[Branch to set the annotation for]: :__git_machete_list_managed' \
-            '(-H --sync-github-prs)'{-H,--sync-github-prs}'[Annotate with GitHub PR numbers and author logins where applicable]' \
-            '(-L --sync-gitlab-mrs)'{-L,--sync-gitlab-mrs}'[Annotate with GitLab MR numbers and author logins where applicable]' \
+            '(-L --sync-gitlab-mrs -H --sync-github-prs)'{-H,--sync-github-prs}'[Annotate with GitHub PR numbers and author logins where applicable]' \
+            '(-H --sync-github-prs -L --sync-gitlab-mrs)'{-L,--sync-gitlab-mrs}'[Annotate with GitLab MR numbers and author logins where applicable]' \
             "${common_flags[@]}"
           ;;
         (completion)
@@ -66,12 +66,13 @@ _git-machete() {
           _arguments "${common_flags[@]}"
           ;;
         (fork-point)
-          _arguments '1:: :__git_branch_names' \
-            '(--inferred)'--inferred'[Display the fork point ignoring any potential override]' \
-            '(--override-to)'--override-to='[Override fork point to the given revision]: :__git_references' \
-            '(--override-to-inferred)'--override-to-inferred'[Override fork point to the inferred location]' \
-            '(--override-to-parent)'--override-to-parent'[Override fork point to the upstream (parent) branch]' \
-            '(--unset-override)'--unset-override='[Unset fork point override by removing machete.overrideForkPoint.<branch>.* configs]: :__git_machete_list_with_overridden_fork_point' \
+          _arguments '1:: :__git_machete_fork_point_branch_arg' \
+            '(--explain --override-to --override-to-inferred --override-to-parent --unset-override)'--explain'[Also list the branches the fork point was inferred from]' \
+            '(--inferred --override-to --override-to-inferred --override-to-parent --unset-override)'--inferred'[Display the fork point ignoring any potential override]' \
+            '(--explain --inferred --override-to --override-to-inferred --override-to-parent --unset-override)'--override-to='[Override fork point to the given revision]: :__git_references' \
+            '(--explain --inferred --override-to --override-to-inferred --override-to-parent --unset-override)'--override-to-inferred'[Override fork point to the inferred location]' \
+            '(--explain --inferred --override-to --override-to-inferred --override-to-parent --unset-override)'--override-to-parent'[Override fork point to the upstream (parent) branch]' \
+            '(--explain --inferred --override-to --override-to-inferred --override-to-parent --unset-override)'--unset-override'[Unset fork point override by removing machete.overrideForkPoint.<branch>.* configs]' \
             "${common_flags[@]}"
           ;;
         (g|go)
@@ -105,6 +106,13 @@ _git-machete() {
             '(-f --fork-point)'{-f,--fork-point=}'[Fork point commit after which the rebased part of history is meant to start]: :__git_references' \
             "${common_flags[@]}"
           ;;
+        (rename)
+          _arguments \
+            '1:: :__git_machete_list_managed' \
+            '(-b --branch)'{-b,--branch=}'[Branch to rename; if not given, the current branch is renamed]: :__git_machete_list_managed' \
+            '(--repoint-tracking)'--repoint-tracking'[After rename, try to set tracking to <remote>/<new-name>, or unset tracking if that remote branch does not exist]' \
+            "${common_flags[@]}"
+          ;;
         (show)
           _arguments \
             '1:: :__git_machete_directions_show' \
@@ -115,14 +123,14 @@ _git-machete() {
           # TODO (#113): suggest further branches based on the previous specified branch (like in Bash completion script)
           _arguments \
             '*:: :__git_machete_list_slidable' \
-            '(-d --down-fork-point)'{-d,--down-fork-point=}'[If updating by rebase, specify fork point commit after which the rebased part of history of the downstream branch is meant to start]: :__git_references' \
+            '(--removed-from-remote -M --merge --no-rebase -d --down-fork-point)'{-d,--down-fork-point=}'[If updating by rebase, specify fork point commit after which the rebased part of history of the downstream branch is meant to start]: :__git_references' \
             '(--delete)'--delete'[Delete branches after sliding them out]' \
-            '(-M --merge)'{-M,--merge}'[Update by merge rather than by rebase]' \
-            '(-n)'-n'[If updating by rebase, equivalent to --no-interactive-rebase. If updating by merge, equivalent to --no-edit-merge]' \
-            '(--no-edit-merge)'--no-edit-merge'[If updating by merge, pass --no-edit flag to underlying git merge]' \
-            '(--no-interactive-rebase)'--no-interactive-rebase'[If updating by rebase, do NOT pass --interactive flag to underlying git rebase]' \
-            '(--no-rebase)'--no-rebase'[Skip rebase of downstream branches after sliding out]' \
-            '(--removed-from-remote)'--removed-from-remote'[Slide out all branches removed from the remote]' \
+            '(--removed-from-remote -d --down-fork-point --no-interactive-rebase --no-rebase -M --merge)'{-M,--merge}'[Update by merge rather than by rebase]' \
+            '(--removed-from-remote -n --no-edit-merge --no-interactive-rebase)'-n'[If updating by rebase, equivalent to --no-interactive-rebase. If updating by merge, equivalent to --no-edit-merge]' \
+            '(--removed-from-remote -n --no-edit-merge --no-interactive-rebase --no-rebase)'--no-edit-merge'[If updating by merge, pass --no-edit flag to underlying git merge]' \
+            '(--removed-from-remote -M --merge -n --no-edit-merge --no-interactive-rebase --no-rebase)'--no-interactive-rebase'[If updating by rebase, do NOT pass --interactive flag to underlying git rebase]' \
+            '(--removed-from-remote -d --down-fork-point -M --merge --no-interactive-rebase --no-edit-merge --no-rebase)'--no-rebase'[Skip rebase of downstream branches after sliding out]' \
+            '(--removed-from-remote -d --down-fork-point -M --merge -n --no-edit-merge --no-interactive-rebase --no-rebase)'--removed-from-remote'[Slide out all branches removed from the remote]' \
             "${common_flags[@]}"
           ;;
         (squash)
@@ -136,38 +144,40 @@ _git-machete() {
             '(-L --list-commits-with-hashes)'{-L,--list-commits-with-hashes}'[List the short hashes and messages of commits introduced on each branch]' \
             '(-l --list-commits)'{-l,--list-commits}'[List the messages of commits introduced on each branch]' \
             '(--no-detect-squash-merges)'--no-detect-squash-merges'[Only consider "strict" (fast-forward or 2-parent) merges, rather than rebase/squash merges, when detecting if a branch is merged into its upstream]' \
+            '(--squash-merge-detection)'--squash-merge-detection='[Mode of detection of squash merges; argument can be "none", "simple" or "exact"]: :__git_machete_opt_squash_merge_detection_args' \
             "${common_flags[@]}"
           ;;
         (t|traverse)
           _arguments \
-            '(-F --fetch)'{-F,--fetch}'[Fetch the remotes of all managed branches at the beginning of traversal]' \
-            '(-H --sync-github-prs)'{-H,--sync-github-prs}'[Create and retarget GitHub PRs while traversing]' \
-            '(-L --sync-gitlab-mrs)'{-L,--sync-gitlab-mrs}'[Create and retarget GitLab MRs while traversing]' \
-            '(-l --list-commits)'{-l,--list-commits}'[List the messages of commits introduced on each branch]' \
-            '(-M --merge)'{-M,--merge}'[Update by merge rather than by rebase]' \
-            '(-n)'-n'[If updating by rebase, equivalent to --no-interactive-rebase. If updating by merge, equivalent to --no-edit-merge]' \
+            '(-W -F --fetch)'{-F,--fetch}'[Fetch the remotes of all managed branches at the beginning of traversal]' \
+            '(-L --sync-gitlab-mrs -H --sync-github-prs)'{-H,--sync-github-prs}'[Create and retarget GitHub PRs while traversing]' \
+            '(-H --sync-github-prs -L --sync-gitlab-mrs)'{-L,--sync-gitlab-mrs}'[Create and retarget GitLab MRs while traversing]' \
+            '(-W -l --list-commits)'{-l,--list-commits}'[List the messages of commits introduced on each branch]' \
+            '(--no-interactive-rebase -M --merge)'{-M,--merge}'[Update by merge rather than by rebase]' \
+            '(-n --no-edit-merge --no-interactive-rebase -y --yes)'-n'[If updating by rebase, equivalent to --no-interactive-rebase. If updating by merge, equivalent to --no-edit-merge]' \
             '(--no-detect-squash-merges)'--no-detect-squash-merges'[Only consider "strict" (fast-forward or 2-parent) merges, rather than rebase/squash merges, when detecting if a branch is merged into its upstream]' \
-            '(--no-edit-merge)'--no-edit-merge'[If updating by merge, pass --no-edit flag to underlying git merge]' \
-            '(--no-interactive-rebase)'--no-interactive-rebase'[If updating by rebase, do NOT pass --interactive flag to underlying git rebase]' \
-            '(--no-push)'--no-push'[Do not push any (neither tracked nor untracked) branches to remote]' \
-            '(--no-push-untracked)'--no-push-untracked'[Do not push untracked branches to remote]' \
-            '(--push)'--push'[Push all (both tracked and untracked) branches to remote (default behavior)]' \
-            '(--push-untracked)'--push-untracked'[Push untracked branches to remote (default behavior)]' \
+            '(-n --no-edit-merge)'--no-edit-merge'[If updating by merge, pass --no-edit flag to underlying git merge]' \
+            '(-n -M --merge --no-interactive-rebase)'--no-interactive-rebase'[If updating by rebase, do NOT pass --interactive flag to underlying git rebase]' \
+            '(--push --no-push)'--no-push'[Do not push any (neither tracked nor untracked) branches to remote]' \
+            '(--push-untracked --no-push-untracked)'--no-push-untracked'[Do not push untracked branches to remote]' \
+            '(--no-push --push)'--push'[Push all (both tracked and untracked) branches to remote (default behavior)]' \
+            '(--no-push-untracked --push-untracked)'--push-untracked'[Push untracked branches to remote (default behavior)]' \
             '(--return-to)'--return-to='[The branch to return after traversal is successfully completed; argument can be "here", "nearest-remaining", or "stay"]: :__git_machete_opt_return_to_args' \
+            '(--squash-merge-detection)'--squash-merge-detection='[Mode of detection of squash merges; argument can be "none", "simple" or "exact"]: :__git_machete_opt_squash_merge_detection_args' \
             '(--start-from)'--start-from='[The branch to start the traversal from; argument can be "here", "root", "first-root", or any branch name]: :__git_machete_opt_start_from_args_or_branches' \
             '(--stop-after)'--stop-after='[The branch to stop the traversal after]: :__git_branch_names' \
-            '(-w --whole)'{-w,--whole}'[Equivalent to -n --start-from=first-root --return-to=nearest-remaining]' \
-            '(-W)'-W'[Equivalent to --fetch --whole]' \
-            '(-y --yes)'{-y,--yes}'[Do not ask for any interactive input; implicates -n]' \
+            '(-W -w --whole)'{-w,--whole}'[Equivalent to -n --start-from=first-root --return-to=nearest-remaining]' \
+            '(-F --fetch -l --list-commits -w --whole -W)'-W'[Equivalent to --fetch --whole]' \
+            '(-n -y --yes)'{-y,--yes}'[Do not ask for any interactive input; implicates -n]' \
             "${common_flags[@]}"
           ;;
          (update)
           _arguments \
-            '(-f --fork-point)'{-f,--fork-point=}'[If updating by rebase, specify fork point commit after which the rebased part of history is meant to start]: :__git_references' \
-            '(-M --merge)'{-M,--merge}'[Update by merge rather than by rebase]' \
-            '(-n)'-n'[If updating by rebase, equivalent to --no-interactive-rebase. If updating by merge, equivalent to --no-edit-merge]' \
-            '(--no-edit-merge)'--no-edit-merge'[If updating by merge, pass --no-edit flag to underlying git merge]' \
-            '(--no-interactive-rebase)'--no-interactive-rebase'[If updating by rebase, do NOT pass --interactive flag to underlying git rebase]' \
+            '(-M --merge -f --fork-point)'{-f,--fork-point=}'[If updating by rebase, specify fork point commit after which the rebased part of history is meant to start]: :__git_references' \
+            '(-f --fork-point --no-interactive-rebase -M --merge)'{-M,--merge}'[Update by merge rather than by rebase]' \
+            '(-n --no-edit-merge --no-interactive-rebase)'-n'[If updating by rebase, equivalent to --no-interactive-rebase. If updating by merge, equivalent to --no-edit-merge]' \
+            '(-n --no-edit-merge)'--no-edit-merge'[If updating by merge, pass --no-edit flag to underlying git merge]' \
+            '(-n -M --merge --no-interactive-rebase)'--no-interactive-rebase'[If updating by rebase, do NOT pass --interactive flag to underlying git rebase]' \
             "${common_flags[@]}"
           ;;
       esac
@@ -193,6 +203,7 @@ __git_machete_cmds=(
   'list:List all branches that fall into one of pre-defined categories (mostly for internal use)'
   'log:Log the part of history specific to the given branch'
   'reapply:Rebase the current branch onto its own fork point'
+  'rename:Rename a branch both in git and in the branch layout file'
   'show:Show name(s) of the branch(es) relative to the position of the current branch'
   'slide-out:Slide the current branch out and sync its downstream (child) branch with its upstream (parent) branch via rebase or merge'
   'squash:Squash the unique history of the current branch into a single commit'
@@ -427,6 +438,16 @@ __git_machete_opt_return_to_args() {
   _describe 'return-to argument' opt_return_to
 }
+__git_machete_opt_squash_merge_detection_args() {
+  local opt_squash_merge_detection
+  opt_squash_merge_detection=(
+    'none:disable squash merge detection entirely'
+    'simple:the default - detect squashes by checking if the merge base of the branch and its upstream matches the branch'
+    'exact:detect squashes by checking if there is a commit on the upstream whose tree matches that of the branch tip'
+  )
+  _describe 'squash-merge-detection argument' opt_squash_merge_detection
+}
 __git_machete_opt_start_from_args() {
   local opt_start_from
   opt_start_from=(
@@ -465,6 +486,17 @@ __git_machete_list_with_overridden_fork_point() {
   _describe 'branch with overridden fork point' result
 }
+# Positional <branch> for `git machete fork-point`: when --unset-override is on the
+# command line, the branch must be one whose fork-point override is being unset
+# (i.e. one currently with an override); otherwise any local branch is allowed.
+__git_machete_fork_point_branch_arg() {
+  if (( ${words[(I)--unset-override]} )); then
+    __git_machete_list_with_overridden_fork_point
+  else
+    __git_branch_names
+  fi
+}
 __git_machete_completion_shells() {
   local shells
   shells=(bash fish zsh)

{git_machete-3.40.0 → git_machete-3.41.0}/completion/git-machete.fish RENAMED Viewed

@@ -2,7 +2,7 @@
 set -l __machete_help_topics config format hooks
 set -l __machete_commands_long add advance anno completion delete-unmanaged diff discover edit file fork-point \
-  github gitlab go help is-managed list log reapply show slide-out squash status traverse update version
+  github gitlab go help is-managed list log reapply rename show slide-out squash status traverse update version
 set -l __machete_commands_short d e g l s t
 set -l __machete_commands $__machete_commands_long $__machete_commands_short
@@ -82,15 +82,22 @@ complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands"
 # git machete fork-point
 complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands" -f -a fork-point -d 'Display or override fork point for a branch'
 # all forms
+# When --unset-override is on the command line, the positional <branch> argument is
+# specifically a branch with an active fork-point override; otherwise any local branch.
 complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --unset-override"                                                                      -f                          -a '(__fish_git_local_branches)'
+complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and __fish_seen_subcommand_from --unset-override"                                                                          -f                          -a '(__machete_with_overridden_fork_point_branches)'
 # form 1
 complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --inferred --unset-override --override-to --override-to-inferred --override-to-parent" -f -l inferred
+# --explain may be combined with --inferred but not with the override-* / --unset-override flags
+complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --explain --unset-override --override-to --override-to-inferred --override-to-parent" -f -l explain
 # form 2
-complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --inferred --unset-override               --override-to-inferred --override-to-parent" -x -l override-to           -a '(__fish_git_refs)'
-complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --inferred --unset-override --override-to --override-to-inferred --override-to-parent" -f -l override-to-inferred
-complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --inferred --unset-override --override-to --override-to-inferred --override-to-parent" -f -l override-to-parent
+complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --explain --inferred --unset-override               --override-to-inferred --override-to-parent" -x -l override-to           -a '(__fish_git_refs)'
+complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --explain --inferred --unset-override --override-to --override-to-inferred --override-to-parent" -f -l override-to-inferred
+complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --explain --inferred --unset-override --override-to --override-to-inferred --override-to-parent" -f -l override-to-parent
 # form 3
-complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --inferred                  --override-to --override-to-inferred --override-to-parent" -x -l unset-override        -a '(__machete_with_overridden_fork_point_branches)'
+# --unset-override is a boolean flag; the positional <branch> (handled above) is the
+# branch whose override gets unset, hence no -x and no value completer here.
+complete -c git-machete -n "__fish_seen_subcommand_from fork-point; and not __fish_seen_subcommand_from --explain --inferred                  --override-to --override-to-inferred --override-to-parent" -f -l unset-override
 # git machete github
 complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands"                                                                                                           -f -a github                                               -d 'Create, check out and manage GitHub PRs while keeping them reflected in git machete'
@@ -119,12 +126,12 @@ complete -c git-machete -n "__fish_seen_subcommand_from github; and __fish_seen_
 # git machete gitlab
 complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands"                                                                                                           -f -a gitlab                                               -d 'Create, check out and manage GitLab MRs while keeping them reflected in git machete'
-complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr sync update-mr-descriptions"    -f -a anno-mrs                                             -d 'Annotate the branches based on their corresponding GitLab MR numbers and authors'
-complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr sync update-mr-descriptions"    -x -a checkout-mrs                                         -d 'Check out the head branch of the given merge requests (specified by number), also traverse chain of merge requests upwards, adding branches one by one to git-machete and check them out locally'
-complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr sync update-mr-descriptions"    -f -a create-mr                                            -d 'Create an MR for the current branch, using the upstream (parent) branch as the MR source branch'
-complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr sync update-mr-descriptions"    -f -a restack-mr                                           -d '(Force-)push and retarget the MR, without adding code owners as reviewers in the process'
-complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr sync update-mr-descriptions"    -f -a retarget-mr                                          -d 'Set the base of MR for the current branch to upstream (parent) branch, as seen by git machete (see git machete show up)'
-complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr sync update-mr-descriptions"    -f -a update-mr-descriptions                               -d 'Update the generated sections of MR descriptions that list the upstream and/or downstream MRs'
+complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr update-mr-descriptions"         -f -a anno-mrs                                             -d 'Annotate the branches based on their corresponding GitLab MR numbers and authors'
+complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr update-mr-descriptions"         -x -a checkout-mrs                                         -d 'Check out the head branch of the given merge requests (specified by number), also traverse chain of merge requests upwards, adding branches one by one to git-machete and check them out locally'
+complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr update-mr-descriptions"         -f -a create-mr                                            -d 'Create an MR for the current branch, using the upstream (parent) branch as the MR source branch'
+complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr update-mr-descriptions"         -f -a restack-mr                                           -d '(Force-)push and retarget the MR, without adding code owners as reviewers in the process'
+complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr update-mr-descriptions"         -f -a retarget-mr                                          -d 'Set the base of MR for the current branch to upstream (parent) branch, as seen by git machete (see git machete show up)'
+complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and not __fish_seen_subcommand_from anno-mrs checkout-mrs create-mr restack-mr retarget-mr update-mr-descriptions"         -f -a update-mr-descriptions                               -d 'Update the generated sections of MR descriptions that list the upstream and/or downstream MRs'
 complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and __fish_seen_subcommand_from anno-mrs;               and not __fish_seen_subcommand_from --with-urls"                   -f -l with-urls                                            -d 'Include MR URLs in the annotations'
 complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and __fish_seen_subcommand_from checkout-mrs;           and not __fish_seen_subcommand_from --all"                         -f -l all                                                  -d 'Checkout all open MRs'
 complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and __fish_seen_subcommand_from checkout-mrs;           and not __fish_seen_subcommand_from --by"                          -x -l by                                                   -d "Checkout someone's open MRs"
@@ -139,7 +146,7 @@ complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and __fish_seen_
 complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and __fish_seen_subcommand_from retarget-mr;            and not __fish_seen_subcommand_from --update-related-descriptions" -f -l update-related-descriptions -s U                     -d 'Update the generated sections of MR descriptions that list the upstream and/or downstream MRs'
 complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and __fish_seen_subcommand_from update-mr-descriptions; and not __fish_seen_subcommand_from --all"                         -f -l all                                                  -d 'Update MR descriptions for all MRs in the project'
 complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and __fish_seen_subcommand_from update-mr-descriptions; and not __fish_seen_subcommand_from --by"                          -f -l by                                                   -d 'Update MR descriptions for all MRs opened by the given user'
-complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and __fish_seen_subcommand_from update-mr-descriptions; and not __fish_seen_subcommand_from --mine"                        -f -l mine                                                 -d 'Update MR descriptions for all MRs opened by the current user associated with the GitHub token'
+complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and __fish_seen_subcommand_from update-mr-descriptions; and not __fish_seen_subcommand_from --mine"                        -f -l mine                                                 -d 'Update MR descriptions for all MRs opened by the current user associated with the GitLab token'
 complete -c git-machete -n "__fish_seen_subcommand_from gitlab; and __fish_seen_subcommand_from update-mr-descriptions; and not __fish_seen_subcommand_from --related"                     -f -l related                                              -d 'Update MR descriptions for all MRs that are upstream and/or downstream of the MR for the current branch'
 # git machete go
@@ -180,6 +187,11 @@ complete -c git-machete -n "__fish_seen_subcommand_from log l"
 complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands" -f                    -a reapply             -d 'Rebase the current branch onto its computed fork point'
 complete -c git-machete -n "__fish_seen_subcommand_from reapply"                 -x -l fork-point -s f -a '(__fish_git_refs)' -d 'Specifies the alternative fork point commit after which the rebased part of history is meant to start'
+# git machete rename
+complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands"  -f -a rename    -d 'Rename a branch both in git and in the branch layout file'
+complete -c git-machete -n "__fish_seen_subcommand_from rename"                                                  -x -l branch -s b -a '(__machete_managed_branches)' -d 'Branch to rename; if not given, the current branch is renamed'
+complete -c git-machete -n "__fish_seen_subcommand_from rename; and not __fish_seen_subcommand_from --repoint-tracking"   -f -l repoint-tracking                                        -d 'After rename, try to set tracking to <remote>/<new-name>, or unset if that remote branch does not exist'
 # git machete show
 complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands"                                                                             -f -a show    -d 'Show name(s) of the branch(es) relative to the position of a branch, accepts down/first/last/next/root/prev/up argument'
 complete -c git-machete -n "__fish_seen_subcommand_from show; and not __fish_seen_subcommand_from current c down d first f last l next n prev p root r up u" -f -a current -d 'the current branch; exits with a non-zero status if none (detached HEAD)'
@@ -194,14 +206,14 @@ complete -c git-machete -n "__fish_seen_subcommand_from show; and not __fish_see
 # git machete slide-out
 complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands" -f -a slide-out -d 'Slide out the current branch and sync its downstream (child) branches with its upstream (parent) branch via rebase or merge'
 complete -c git-machete -n "__fish_seen_subcommand_from slide-out"               -f -a '(__machete_slidable_branches)'
-complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote"                                                        -f -l removed-from-remote                         -d 'Slide out all branches removed from the remote'
-complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote --merge -M"                                             -x -l down-fork-point -s d -a '(__fish_git_refs)' -d 'If updating by rebase, specifies the alternative fork point for downstream branches for the operation. Not allowed if updating by merge'
-complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --delete"                                                                     -f -l delete                                      -d 'Delete branches after sliding them out'
-complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote --merge -M --down-fork-point -d"                        -f -l merge           -s M                        -d 'Update the downstream branch by merge rather than by rebase'
-complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote -n --no-edit-merge --no-interactive-rebase"             -f                    -s n                        -d 'If updating by rebase, equivalent to --no-interactive-rebase. If updating by merge, equivalent to --no-edit-merge'
-complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote -n --no-edit-merge --no-interactive-rebase"             -f -l no-edit-merge                               -d 'If updating by merge, skip opening the editor for merge commit message while doing git merge (i.e. pass --no-edit flag to underlying git merge). Not allowed if updating by rebase'
-complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote -M --merge -n --no-edit-merge --no-interactive-rebase"  -f -l no-interactive-rebase                       -d 'If updating by rebase, run git rebase in non-interactive mode (without -i/--interactive flag). Not allowed if updating by merge'
-complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote -d --down-fork-point -n --no-edit-merge --no-rebase"    -f -l no-rebase                                   -d 'Skip rebase of downstream branches after sliding out'
+complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote -d --down-fork-point -M --merge -n --no-edit-merge --no-interactive-rebase --no-rebase" -f -l removed-from-remote                         -d 'Slide out all branches removed from the remote'
+complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote --merge -M --no-rebase"                                                        -x -l down-fork-point -s d -a '(__fish_git_refs)' -d 'If updating by rebase, specifies the alternative fork point for downstream branches for the operation. Not allowed if updating by merge'
+complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --delete"                                                                                                  -f -l delete                                      -d 'Delete branches after sliding them out'
+complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote --merge -M --down-fork-point -d --no-rebase"                                          -f -l merge           -s M                        -d 'Update the downstream branch by merge rather than by rebase'
+complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote -n --no-edit-merge --no-interactive-rebase"                                           -f                    -s n                        -d 'If updating by rebase, equivalent to --no-interactive-rebase. If updating by merge, equivalent to --no-edit-merge'
+complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote -n --no-edit-merge --no-interactive-rebase --no-rebase"                               -f -l no-edit-merge                               -d 'If updating by merge, skip opening the editor for merge commit message while doing git merge (i.e. pass --no-edit flag to underlying git merge). Not allowed if updating by rebase'
+complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote -M --merge -n --no-edit-merge --no-interactive-rebase --no-rebase"                    -f -l no-interactive-rebase                       -d 'If updating by rebase, run git rebase in non-interactive mode (without -i/--interactive flag). Not allowed if updating by merge'
+complete -c git-machete -n "__fish_seen_subcommand_from slide-out; and not __fish_seen_subcommand_from --removed-from-remote -d --down-fork-point -M --merge --no-edit-merge --no-interactive-rebase --no-rebase"  -f -l no-rebase                                   -d 'Skip rebase of downstream branches after sliding out'
 # git machete squash
 complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands" -f -a squash -d 'Squash the unique history of the current branch into a single commit'
@@ -213,28 +225,30 @@ complete -c git-machete -n "__fish_seen_subcommand_from status s"
 complete -c git-machete -n "__fish_seen_subcommand_from status s; and not __fish_seen_subcommand_from --list-commits -l"             -f -l list-commits             -s l                   -d 'Additionally list the commits introduced on each branch'
 complete -c git-machete -n "__fish_seen_subcommand_from status s; and not __fish_seen_subcommand_from --list-commits-with-hashes -L" -f -l list-commits-with-hashes -s L                   -d 'Additionally list the short hashes and messages of commits introduced on each branch'
 complete -c git-machete -n "__fish_seen_subcommand_from status s; and not __fish_seen_subcommand_from --no-detect-squash-merges"     -f -l no-detect-squash-merges                         -d 'Only consider "strict" (fast-forward or 2-parent) merges, rather than rebase/squash merges, when detecting if a branch is merged into its upstream (parent)'
+complete -c git-machete -n "__fish_seen_subcommand_from status s"                                                                    -x -l squash-merge-detection   -a 'none simple exact' -d 'Mode of detection of squash merges; argument can be "none", "simple" (default) or "exact"'
 # git machete traverse
 complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands" -f -a traverse -d 'Walk through the tree of branch dependencies and rebase, merge, slide out, push and/or pull each branch one by one'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --fetch -F"                -f -l fetch           -s F                             -d 'Fetch the remotes of all managed branches at the beginning of traversal (no git pull involved, only git fetch)'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --list-commits -l"         -f -l list-commits    -s l                             -d 'When printing the status, additionally list the messages of commits introduced on each branch'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --sync-gitlab-mrs"         -f -l sync-github-prs -s H                             -d 'Create and retarget GitHub PRs while traversing'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --sync-github-prs"         -f -l sync-gitlab-mrs -s L                             -d 'Create and retarget GitLab MRs while traversing'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --merge -M"                -f -l merge           -s M                             -d 'Update by merge rather than by rebase'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --yes -y"                  -f                    -s n                             -d 'If updating by rebase, equivalent to --no-interactive-rebase. If updating by merge, equivalent to --no-edit-merge'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --no-detect-squash-merges" -f -l no-detect-squash-merges                          -d 'Only consider "strict" (fast-forward or 2-parent) merges, rather than rebase/squash merges, when detecting if a branch is merged into its upstream (parent)'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --no-edit-merge"           -f -l no-edit-merge                                    -d 'If updating by merge, skip opening the editor for merge commit message while doing git merge (i.e. pass --no-edit flag to underlying git merge). Not allowed if updating by rebase'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --no-interactive-rebase"   -f -l no-interactive-rebase                            -d 'If updating by rebase, run git rebase in non-interactive mode (without -i/--interactive flag). Not allowed if updating by merge'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --no-push"                 -f -l no-push                                          -d 'Do not push any (neither tracked nor untracked) branches to remote, re-enable via --push'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --no-push-untracked"       -f -l no-push-untracked                                -d 'Do not push untracked branches to remote, re-enable via --push-untracked'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --push"                    -f -l push                                             -d 'Push all (both tracked and untracked) branches to remote - default behavior'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --push-untracked"          -f -l push-untracked                                   -d 'Push untracked branches to remote - default behavior'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t"                                                                -x -l return-to       -a 'STAY HERE NEAREST-REMAINING' -d 'Specifies the branch to return after traversal is successfully completed'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t"                                                                -x -l start-from      -a 'HERE ROOT FIRST-ROOT (__fish_git_local_branches)' -d 'Specifies the branch to start the traversal from'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t"                                                                -x -l stop-after      -a '(__fish_git_local_branches)' -d 'Specifies the branch to stop the traversal after'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --whole -w"                -f -l whole           -s w                             -d 'Equivalent to -n --start-from=first-root --return-to=nearest-remaining'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from -W"                        -f                    -s W                             -d 'Equivalent to --fetch --whole; useful for even more automated traversal of all branches'
-complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --yes -y"                  -f -l yes             -s y                             -d 'Do not ask for any interactive input, including confirmation of rebase/push/pull. Implies -n'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --fetch -F -W"                                       -f -l fetch           -s F                             -d 'Fetch the remotes of all managed branches at the beginning of traversal (no git pull involved, only git fetch)'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --list-commits -l -W"                                -f -l list-commits    -s l                             -d 'When printing the status, additionally list the messages of commits introduced on each branch'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --sync-github-prs -H --sync-gitlab-mrs -L"           -f -l sync-github-prs -s H                             -d 'Create and retarget GitHub PRs while traversing'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --sync-gitlab-mrs -L --sync-github-prs -H"           -f -l sync-gitlab-mrs -s L                             -d 'Create and retarget GitLab MRs while traversing'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --merge -M --no-interactive-rebase"                  -f -l merge           -s M                             -d 'Update by merge rather than by rebase'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from -n --no-edit-merge --no-interactive-rebase --yes -y" -f                    -s n                             -d 'If updating by rebase, equivalent to --no-interactive-rebase. If updating by merge, equivalent to --no-edit-merge'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --no-detect-squash-merges"                           -f -l no-detect-squash-merges                          -d 'Only consider "strict" (fast-forward or 2-parent) merges, rather than rebase/squash merges, when detecting if a branch is merged into its upstream (parent)'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --no-edit-merge -n"                                  -f -l no-edit-merge                                    -d 'If updating by merge, skip opening the editor for merge commit message while doing git merge (i.e. pass --no-edit flag to underlying git merge). Not allowed if updating by rebase'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --no-interactive-rebase -n --merge -M"               -f -l no-interactive-rebase                            -d 'If updating by rebase, run git rebase in non-interactive mode (without -i/--interactive flag). Not allowed if updating by merge'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --no-push --push"                                    -f -l no-push                                          -d 'Do not push any (neither tracked nor untracked) branches to remote, re-enable via --push'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --no-push-untracked --push-untracked"                -f -l no-push-untracked                                -d 'Do not push untracked branches to remote, re-enable via --push-untracked'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --push --no-push"                                    -f -l push                                             -d 'Push all (both tracked and untracked) branches to remote - default behavior'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --push-untracked --no-push-untracked"                -f -l push-untracked                                   -d 'Push untracked branches to remote - default behavior'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t"                                                                                          -x -l return-to       -a 'STAY HERE NEAREST-REMAINING' -d 'Specifies the branch to return after traversal is successfully completed'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t"                                                                                          -x -l squash-merge-detection -a 'none simple exact' -d 'Mode of detection of squash merges; argument can be "none", "simple" (default) or "exact"'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t"                                                                                          -x -l start-from      -a 'HERE ROOT FIRST-ROOT (__fish_git_local_branches)' -d 'Specifies the branch to start the traversal from'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t"                                                                                          -x -l stop-after      -a '(__fish_git_local_branches)' -d 'Specifies the branch to stop the traversal after'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --whole -w -W"                                       -f -l whole           -s w                             -d 'Equivalent to -n --start-from=first-root --return-to=nearest-remaining'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from -W --fetch -F --list-commits -l --whole -w"          -f                    -s W                             -d 'Equivalent to --fetch --whole; useful for even more automated traversal of all branches'
+complete -c git-machete -n "__fish_seen_subcommand_from traverse t; and not __fish_seen_subcommand_from --yes -y -n"                                         -f -l yes             -s y                             -d 'Do not ask for any interactive input, including confirmation of rebase/push/pull. Implies -n'
 # git machete update
 complete -c git-machete -n "not __fish_seen_subcommand_from $__machete_commands" -f -a update -d 'Sync the current branch with its upstream (parent) branch via rebase or merge'

git-machete 3.40.0__tar.gz → 3.41.0__tar.gz

git-machete 3.40.0tar.gz → 3.41.0tar.gz