From: Denton Liu <liu.denton@gmail.com>
To: git@vger.kernel.org
Cc: liu.denton@gmail.com, anmolmago@gmail.com, briankyho@gmail.com,
david.lu97@outlook.com, shirui.wang@hotmail.com,
davvid@gmail.com, gitster@pobox.com
Subject: [PATCH v3 0/3] Add --gui to mergetool
Date: Wed, 24 Oct 2018 12:25:22 -0400 [thread overview]
Message-ID: <cover.1540398076.git.liu.denton@gmail.com> (raw)
In-Reply-To: <b0a5d6926c130c0b143435a96ed956b3ed20dad7.1540360514.git.liu.denton@gmail.com>
This adds another patch on top of the existing patchset in order to document the
guitool keys for `git config`. This way, the completions script will now be able
to complete these key values as well.
Denton Liu (3):
mergetool: accept -g/--[no-]gui as arguments
completion: support `git mergetool --[no-]gui`
doc: document diff/merge.guitool config keys
Documentation/diff-config.txt | 8 ++++++++
Documentation/git-mergetool.txt | 11 +++++++++++
Documentation/merge-config.txt | 6 ++++++
contrib/completion/git-completion.bash | 2 +-
git-mergetool--lib.sh | 16 +++++++++++-----
git-mergetool.sh | 11 +++++++++--
6 files changed, 46 insertions(+), 8 deletions(-)
--
2.19.1.544.ge0b0585a1.dirty
next prev parent reply other threads:[~2018-10-24 16:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-24 2:25 [PATCH 1/2] mergetool: Accept -g/--[no-]gui as arguments Denton Liu
2018-10-24 5:10 ` Junio C Hamano
2018-10-24 5:30 ` Denton Liu
2018-10-24 5:44 ` David Aguilar
2018-10-24 5:58 ` [PATCH v2 1/2] mergetool: accept " Denton Liu
2018-10-24 16:25 ` Denton Liu [this message]
2018-10-24 16:25 ` [PATCH v3 1/3] " Denton Liu
2018-10-24 16:25 ` [PATCH v3 2/3] completion: support `git mergetool --[no-]gui` Denton Liu
2018-10-24 16:25 ` [PATCH v3 3/3] doc: document diff/merge.guitool config keys Denton Liu
2018-10-26 6:11 ` [RESEND PATCH v3 0/3] Add --gui to mergetool Denton Liu
2018-10-26 13:15 ` Junio C Hamano
2018-10-26 6:11 ` [RESEND PATCH v3 1/3] mergetool: accept -g/--[no-]gui as arguments Denton Liu
2018-10-26 6:11 ` [RESEND PATCH v3 2/3] completion: support `git mergetool --[no-]gui` Denton Liu
2018-10-26 6:11 ` [RESEND PATCH v3 3/3] doc: document diff/merge.guitool config keys Denton Liu
2018-10-24 5:58 ` [PATCH v2 2/2] completion: support `git mergetool --[no-]gui` 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.1540398076.git.liu.denton@gmail.com \
--to=liu.denton@gmail.com \
--cc=anmolmago@gmail.com \
--cc=briankyho@gmail.com \
--cc=david.lu97@outlook.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=shirui.wang@hotmail.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.