Apply minor fixes before the release of v3.2.0

.circleci/config.yml

@@ -26,7 +26,7 @@ jobs:
             sudo mv yq_linux_amd64 /usr/local/bin/yq
             sudo chmod +x /usr/local/bin/yq
 
-      - run: PYTHON_VERSION=3.6 GIT_VERSION=1.8.0 bash ci/tox/ci-run.sh  # Earliest versions of python/git supported by git-machete
+      - run: PYTHON_VERSION=3.6 GIT_VERSION=1.8.0  bash ci/tox/ci-run.sh  # Earliest versions of python/git supported by git-machete
       - run: PYTHON_VERSION=3.7 GIT_VERSION=2.7.6  bash ci/tox/ci-run.sh
       - run: PYTHON_VERSION=3.8 GIT_VERSION=2.25.0 bash ci/tox/ci-run.sh
       - run: PYTHON_VERSION=3.9 GIT_VERSION=2.30.1 bash ci/tox/ci-run.sh

README.md

@@ -172,7 +172,7 @@ The more advanced features like automated traversal, upstream inference and tree
 
 ## Git compatibility
 
-git-machete (since version 2.13.0) is compatible with git >= 1.8.0
+git-machete (since version 2.13.0) is compatible with git >= 1.8.0.
 
 
 ## Contributions

RELEASE_NOTES.md

@@ -2,10 +2,11 @@
 
 ## New in git-machete 3.2.0
 
-- improved: slide-out can target branches with any number of downstream (child) branches
+- improved: `slide-out` can target branches with any number of downstream (child) branches (contributed by @asford)
 - fixed: detection of no-op rebase cases in fork-point algorithm
 - fixed: if a branch is merged to its parent, `git machete status -l` now always displays an empty list of commits
-- improved: `traverse` and `status` by default also consider squash merges when checking if a branch is merged to parent, use `--no-detect-squash-merges` to fall back to strict merge detection
+- improved: `status` and `traverse` by default also consider squash merges when checking if a branch is merged to parent (contributed by @asford)
+- added: `--no-detect-squash-merges` flag in `status` and `traverse` to fall back to strict merge detection
 
 ## New in git-machete 3.1.1
 

git_machete/cmd.py

@@ -3756,7 +3756,7 @@ def strip_first_fragment(rb: str) -> str:
             cb = current_branch(cli_ctxt)
             squash(cli_ctxt, cb, cli_ctxt.opt_fork_point or fork_point(cli_ctxt, cb, use_overrides=True))
         elif cmd in ("s", "status"):
-            expect_no_param(parse_options(args, "Ll", ["color=", "merge", "list-commits-with-hashes", "list-commits", "no-detect-squash-merges"]))
+            expect_no_param(parse_options(args, "Ll", ["color=", "list-commits-with-hashes", "list-commits", "no-detect-squash-merges"]))
             read_definition_file(cli_ctxt)
             expect_at_least_one_managed_branch()
             status(cli_ctxt, warn_on_yellow_edges=True)