On Fri, Aug 10, 2012 at 6:52 AM, David Aguilar <dav...@gmail.com> wrote:

> Add an entry for --tool-help to the mergetool documentation.
>
> Move --tool-help in the difftool documentation so that it is
> listed immediately after --tool so that it is easier to find.
>
> Signed-off-by: David Aguilar <dav...@gmail.com>

Funny, I was doing almost the same thing in [1], so I obviously like
it. Back then Junio found it "Meh" because "it already is mentioned in
the
description of --tool above", but I still think all available command
line option should be listed as such.

> --- a/Documentation/git-mergetool.txt
> +++ b/Documentation/git-mergetool.txt
> @@ -64,6 +64,9 @@ variable `mergetool.<tool>.trustExitCode` can be set to 
> `true`.
>  Otherwise, 'git mergetool' will prompt the user to indicate the
>  success of the resolution after the custom tool has exited.
>
> +--tool-help::
> +       Print a list of diff tools that may be used with `--tool`.
> +

This should say "list of merge tools", however.

[1] http://thread.gmane.org/gmane.comp.version-control.git/201913/focus=201922

-- 
Sebastian Schuberth
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to