From: Denton Liu <liu.denton@gmail.com>
To: Git Mailing List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/3] advertise --skip for cherry-pick and revert better
Date: Tue, 27 Aug 2019 00:45:33 -0400 [thread overview]
Message-ID: <cover.1566880835.git.liu.denton@gmail.com> (raw)
In-Reply-To: <cover.1566637431.git.liu.denton@gmail.com>
Hi Junio, thanks for the suggestion. I incorporated your suggestion.
Also, I decided to incorporate another patch (3/3) I was planning on
submitting later since both these patchsets have a common purpose:
advertising the `--skip` option better.
Before, the completion script would not complete `--skip` for
cherry-pick and revert, even though it is a valid option while that
operation is in progress. Add that missing completion.
Also, if a cherry-pick or revert is still in progress, mention the
`--skip` flag in the status message so that users are more aware of
their options.
Changes since v1:
* Instead of outright replacing the old completion variables, make them derive
from a common variable.
* Add patch 3/3 and change the focus of this patchset so that it's focused on
advertising the `--skip` option better.
Denton Liu (3):
completion: merge options for cherry-pick and revert
completion: add --skip for cherry-pick and revert
status: mention --skip for revert and cherry-pick
contrib/completion/git-completion.bash | 6 ++++--
t/t7512-status-help.sh | 6 ++++++
wt-status.c | 4 ++++
3 files changed, 14 insertions(+), 2 deletions(-)
Range-diff against v1:
1: cdcac97554 < -: ---------- completion: merge options for cherry-pick and revert
2: 75adf58158 < -: ---------- completion: add --skip for cherry-pick and revert
-: ---------- > 1: 862802366a completion: merge options for cherry-pick and revert
-: ---------- > 2: c83feb3d6e completion: add --skip for cherry-pick and revert
-: ---------- > 3: be64ce1e92 status: mention --skip for revert and cherry-pick
--
2.23.0.248.g3a9dd8fb08
next prev parent reply other threads:[~2019-08-27 4:45 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-24 9:04 [PATCH 0/2] completion: complete --skip for cherry-pick and revert Denton Liu
2019-08-24 9:04 ` [PATCH 1/2] completion: merge options " Denton Liu
2019-08-26 16:59 ` Junio C Hamano
2019-08-24 9:04 ` [PATCH 2/2] completion: add --skip " Denton Liu
2019-08-27 4:45 ` Denton Liu [this message]
2019-08-27 4:45 ` [PATCH v2 1/3] completion: merge options " Denton Liu
2019-08-27 4:45 ` [PATCH v2 2/3] completion: add --skip " Denton Liu
2019-08-27 4:45 ` [PATCH v2 3/3] status: mention --skip for revert and cherry-pick Denton Liu
2019-08-27 21:56 ` Junio C Hamano
2019-08-27 23:18 ` Denton Liu
2019-08-28 2:47 ` Junio C Hamano
2019-08-28 6:45 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=cover.1566880835.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).