git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Denton Liu <liu.denton@gmail.com>
To: git@vger.kernel.org
Subject: [PATCH] Remove --no-gui option from difftool usage string
Date: Fri, 3 Feb 2017 18:56:17 -0800	[thread overview]
Message-ID: <20170204025617.GA9221@arch-attack.localdomain> (raw)

The --no-gui option not documented in the manpage, nor is it actually
used in the source code. This change removes it from the usage help
that's printed.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
---
 git-difftool.perl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git-difftool.perl b/git-difftool.perl
index a5790d03a..657d5622d 100755
--- a/git-difftool.perl
+++ b/git-difftool.perl
@@ -29,8 +29,8 @@ sub usage
 	print << 'USAGE';
 usage: git difftool [-t|--tool=<tool>] [--tool-help]
                     [-x|--extcmd=<cmd>]
-                    [-g|--gui] [--no-gui]
-                    [--prompt] [-y|--no-prompt]
+                    [-g|--gui] [--prompt]
+                    [-y|--no-prompt]
                     [-d|--dir-diff]
                     ['git diff' options]
 USAGE
-- 
2.11.0


             reply	other threads:[~2017-02-04  2:56 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-04  2:56 Denton Liu [this message]
2017-02-04  5:58 ` [PATCH] Remove --no-gui option from difftool usage string Jacob Keller
2017-02-04  6:23   ` Denton Liu
2017-02-05 10:22     ` David Aguilar
2017-02-05 20:17 ` [BUG] was: " David Aguilar
2017-02-05 21:23   ` [PATCH] difftool: fix bug when printing usage David Aguilar
2017-02-06 16:58     ` Johannes Schindelin
2017-02-06 18:13       ` Junio C Hamano
2017-02-07 11:21         ` Johannes Schindelin
2017-02-07 20:03           ` Junio C Hamano
2017-02-07 20:06             ` Junio C Hamano
2017-02-08 15:06               ` Johannes Schindelin

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=20170204025617.GA9221@arch-attack.localdomain \
    --to=liu.denton@gmail.com \
    --cc=git@vger.kernel.org \
    /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).