All of lore.kernel.org
 help / color / mirror / Atom feed
From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 0/2] checkout: learn the checkout.guess config variable
Date: Wed,  7 Oct 2020 22:48:13 -0700	[thread overview]
Message-ID: <cover.1602136063.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1602047333.git.liu.denton@gmail.com>

If a user does not wish to use DWIM behaviour, they must manually
specify git checkout --no-guess each time. Teach checkout and switch to
honour the checkout.guess config variable instead.

Changes since v1:

* Replace enumerated priority list with bullet points

Changes since v2:

* Clarify that `--guess` is the default for checkout in the docs

Denton Liu (2):
  Documentation/config/checkout: replace sq with backticks
  checkout: learn to respect checkout.guess

 Documentation/config/checkout.txt      | 21 +++++++----
 Documentation/git-checkout.txt         |  5 ++-
 Documentation/git-switch.txt           |  3 ++
 builtin/checkout.c                     |  7 +++-
 contrib/completion/git-completion.bash | 25 ++++++++-----
 t/t2024-checkout-dwim.sh               | 11 ++++++
 t/t2060-switch.sh                      |  5 ++-
 t/t9902-completion.sh                  | 52 ++++++++++++++++++++++++++
 8 files changed, 109 insertions(+), 20 deletions(-)

Range-diff against v2:
1:  f08d3f796a = 1:  f08d3f796a Documentation/config/checkout: replace sq with backticks
2:  2678680a08 ! 2:  eb9daf4bcd checkout: learn to respect checkout.guess
    @@ Documentation/config/checkout.txt: will checkout the `<something>` branch on ano
     
      ## Documentation/git-checkout.txt ##
     @@ Documentation/git-checkout.txt: branches from there if `<branch>` is ambiguous but exists on the
    + 'origin' remote. See also `checkout.defaultRemote` in
      linkgit:git-config[1].
      +
    - Use `--no-guess` to disable this.
    +-Use `--no-guess` to disable this.
    ++`--guess` is the default behavior. Use `--no-guess` to disable it.
     ++
     +The default behavior can be set via the `checkout.guess` configuration
     +variable.
-- 
2.28.0.942.g77c4c6094c


  parent reply	other threads:[~2020-10-08  5:48 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-04 11:18 [PATCH 0/2] checkout: learn the checkout.guess config variable Denton Liu
2020-10-04 11:18 ` [PATCH 1/2] Documentation/config/checkout: replace sq with backticks Denton Liu
2020-10-04 11:18 ` [PATCH 2/2] checkout: learn to respect checkout.guess Denton Liu
2020-10-04 17:46   ` Junio C Hamano
2020-10-06  8:07     ` Denton Liu
2020-10-06 18:41       ` Junio C Hamano
2020-10-06 19:31         ` Johannes Schindelin
2020-10-07  5:09 ` [PATCH v2 0/2] checkout: learn the checkout.guess config variable Denton Liu
2020-10-07  5:09   ` [PATCH v2 1/2] Documentation/config/checkout: replace sq with backticks Denton Liu
2020-10-07  5:09   ` [PATCH v2 2/2] checkout: learn to respect checkout.guess Denton Liu
2020-10-07 16:47     ` Junio C Hamano
2020-10-08  5:48   ` Denton Liu [this message]
2020-10-08  5:48     ` [PATCH v3 1/2] Documentation/config/checkout: replace sq with backticks Denton Liu
2020-10-08  5:48     ` [PATCH v3 2/2] checkout: learn to respect checkout.guess Denton Liu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cover.1602136063.git.liu.denton@gmail.com \
    --to=liu.denton@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.