From: "Phillip Wood via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 0/1] git-prompt: improve cherry-pick/revert detection
Date: Mon, 01 Jul 2019 07:21:06 -0700 (PDT) [thread overview]
Message-ID: <pull.281.git.gitgitgadget@gmail.com> (raw)
Fix the detection of in-progress cherry-picks and reverts when the user
commits or resets a conflict resolution in the middle of a sequence of
picks/reverts.
Phillip Wood (1):
git-prompt: improve cherry-pick/revert detection
contrib/completion/git-prompt.sh | 37 ++++++++++++++++++++++++++++----
t/t9903-bash-prompt.sh | 20 +++++++++++++++--
2 files changed, 51 insertions(+), 6 deletions(-)
base-commit: 8dca754b1e874719a732bc9ab7b0e14b21b1bc10
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-281%2Fphillipwood%2Fwip%2Fprompt-status-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-281/phillipwood/wip/prompt-status-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/281
--
gitgitgadget
next reply other threads:[~2019-07-01 14:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-01 14:21 Phillip Wood via GitGitGadget [this message]
2019-07-01 14:21 ` [PATCH 1/1] git-prompt: improve cherry-pick/revert detection Phillip Wood via GitGitGadget
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=pull.281.git.gitgitgadget@gmail.com \
--to=gitgitgadget@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.