From: Markus Heidelberg <markus.heidelberg@web.de>
To: David Aguilar <davvid@gmail.com>
Cc: gitster@pobox.com, git@vger.kernel.org, charles@hashpling.org
Subject: Re: [PATCH 07/14] difftool: add a -y shortcut for --no-prompt
Date: Tue, 7 Apr 2009 00:17:25 +0200 [thread overview]
Message-ID: <200904070017.25501.markus.heidelberg@web.de> (raw)
In-Reply-To: <1239006689-14695-8-git-send-email-davvid@gmail.com>
David Aguilar, 06.04.2009:
> diff --git a/contrib/difftool/git-difftool.txt b/contrib/difftool/git-difftool.txt
> index 2b7bc03..4dff529 100644
> --- a/contrib/difftool/git-difftool.txt
> +++ b/contrib/difftool/git-difftool.txt
> @@ -3,35 +3,32 @@ git-difftool(1)
>
> NAME
> ----
> -git-difftool - compare changes using common merge tools
> +git-difftool - Show changes using common diff tools
>
> SYNOPSIS
> --------
> -'git difftool' [--tool=<tool>] [--no-prompt] ['git diff' options]
> +'git difftool' [-t|--tool=<tool>] [-y|--no-prompt] [<'git diff' options>]
"-t <tool>" would be more correct than only "-t". But I'm not sure if it
should go in there, mergetool doesn't have it either. It's only the
synopsis, is there any "official" guideline on how much to include
there and whether to avoid different options with the same meaning?
prev parent reply other threads:[~2009-04-06 22:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-06 8:31 git-{merge,diff}tool refactor round three David Aguilar
2009-04-06 8:31 ` [PATCH 01/14] doc/merge-config: list ecmerge as a built-in merge tool David Aguilar
2009-04-06 8:31 ` [PATCH 02/14] git-mergetool/difftool: make (g)vimdiff workable under Windows David Aguilar
2009-04-06 8:31 ` [PATCH 03/14] git-mergetool: add new merge tool TortoiseMerge David Aguilar
2009-04-06 8:31 ` [PATCH 04/14] difftool: remove merge options for opendiff, tkdiff, kdiff3 and xxdiff David Aguilar
2009-04-06 8:31 ` [PATCH 05/14] difftool: remove the backup file feature David Aguilar
2009-04-06 8:31 ` [PATCH 06/14] difftool: use perl built-ins when testing for msys David Aguilar
2009-04-06 8:31 ` [PATCH 07/14] difftool: add a -y shortcut for --no-prompt David Aguilar
2009-04-06 8:31 ` [PATCH 08/14] difftool/mergetool: add diffuse as merge and diff tool David Aguilar
2009-04-06 8:31 ` [PATCH 09/14] difftool: move 'git-difftool' out of contrib David Aguilar
2009-04-06 8:31 ` [PATCH 10/14] difftool: add various git-difftool tests David Aguilar
2009-04-06 8:31 ` [PATCH 11/14] difftool: add support for a difftool.prompt config variable David Aguilar
2009-04-06 8:31 ` [PATCH 12/14] bash completion: add git-difftool David Aguilar
2009-04-06 8:31 ` [PATCH 13/14] mergetool: use $( ... ) instead of `backticks` David Aguilar
2009-04-06 8:31 ` [PATCH 14/14] difftool/mergetool: refactor commands to use git-mergetool--lib David Aguilar
2009-04-06 23:42 ` [PATCH 09/14] difftool: move 'git-difftool' out of contrib Markus Heidelberg
2009-04-06 22:17 ` Markus Heidelberg [this message]
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=200904070017.25501.markus.heidelberg@web.de \
--to=markus.heidelberg@web.de \
--cc=charles@hashpling.org \
--cc=davvid@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.
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).