From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 05 Aug 2014 22:10:30 GMT
Subject: Re: [PATCH 3/7] Documentation: git-init: template directory: reword
Message-ID: <xmqqmwbioaeh.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1407002817-29221-4-git-send-email-linusarver@gmail.com>

Linus Arver <linusarver@gmail.com> writes:

> Signed-off-by: Linus Arver <linusarver@gmail.com>
> ---

This seems to reword and also reformat at the same time, but was the
latter change (i.e. to unindent the bulletted items and to remove
blank lines between items) necessary?

>  Documentation/git-init.txt | 14 +++++---------
>  1 file changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
> index 45501d0..f21b85b 100644
> --- a/Documentation/git-init.txt
> +++ b/Documentation/git-init.txt
> @@ -113,22 +113,18 @@ line, the command is run inside the directory (possibly after creating it).
>  
>  --
>  
> -
>  TEMPLATE DIRECTORY
>  ------------------
>  
>  The template directory contains files and directories that will be copied to
>  the `$GIT_DIR` after it is created.
>  
> -The template directory used will be (in order):
> -
> - - The argument given with the `--template` option.
> -
> - - The contents of the `$GIT_TEMPLATE_DIR` environment variable.
> -
> - - The `init.templatedir` configuration variable.
> +The template directory will be one of the following (in order):
>  
> - - The default template directory: `/usr/share/git-core/templates`.
> +- the argument given with the `--template` option;
> +- the contents of the `$GIT_TEMPLATE_DIR` environment variable;
> +- the `init.templatedir` configuration variable; or
> +- the default template directory: `/usr/share/git-core/templates`.
>  
>  The default template directory includes some directory structure, some
>  suggested "exclude patterns", and copies of sample "hook" files.