[v3,0/3] Add --gui to mergetool
mbox series

Message ID cover.1540398076.git.liu.denton@gmail.com
Headers show
Series
  • Add --gui to mergetool
Related show

Message

Denton Liu Oct. 24, 2018, 4:25 p.m. UTC
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(-)