Skip to content

Add --gui to mergetool

Denton Liu git 4 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest posting 2/20 of 3 patches 1 replyIn review
  2. v3 posting 1/23 patches 0 repliesSuperseded
  3. v22 patches 0 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v12 patches3 repliesSuperseded

Patches in v3 posting 2/2 No applies recorded yet

None of the 3 patches the cover letter announces are in this archive.

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v3 yet.

Read the v3 thread

Cover letter [RESEND PATCH v3 0/3] Add --gui to mergetool

This is a resend of patchset v3 where we add 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(-)
Signature · 1 line
2.19.1