From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 11 Sep 2014 17:35:30 GMT
Subject: Re: [PATCH] Documentation: use single-parameter --cacheinfo in example
Message-ID: <xmqqppf2dpr1.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1410448791-31514-1-git-send-email-prohaska@zib.de>

Steffen Prohaska <prohaska@zib.de> writes:

> The single-parameter form is described as the preferred way.  Separate
> arguments are only supported for backward compatibility.  Update the
> example to the recommended form.
>
> Signed-off-by: Steffen Prohaska <prohaska@zib.de>
> ---

My fault.  Thanks for catching.

>  Documentation/git-update-index.txt | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
> index dfc09d9..82eca6f 100644
> --- a/Documentation/git-update-index.txt
> +++ b/Documentation/git-update-index.txt
> @@ -202,7 +202,7 @@ merging.
>  To pretend you have a file with mode and sha1 at path, say:
>  
>  ----------------
> -$ git update-index --cacheinfo mode sha1 path
> +$ git update-index --cacheinfo <mode>,<sha1>,<path>
>  ----------------
>  
>  '--info-only' is used to register files without placing them in the object