From: Eric Sunshine <sunshine@sunshineco.com>
Date: Sat, 30 Aug 2014 11:11:08 GMT
Subject: Re: [PATCH 00/32] nd/multiple-work-trees cleanup
Message-ID: <CAPig+cT6J-qts-KqYK-quy+zLmWOfk6eeMfuoXBPKN4he=bncg@mail.gmail.com>
In-Reply-To: <1409387642-24492-1-git-send-email-pclouds@gmail.com>

On Sat, Aug 30, 2014 at 4:33 AM, Nguyễn Thái Ngọc Duy <pclouds@gmail.com> wrote:
> This collapes some bug fix patches into the main ones, adds a few more
> tests to cover recent changes, and removes advice.checkoutLocked (when
> things are controversal, probably best to go without them until they
> are settled). Diff against current version in 'pu'
>
> diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
> index 6bd82af..c9a7d1a 100644
> --- a/Documentation/gitrepository-layout.txt
> +++ b/Documentation/gitrepository-layout.txt
> @@ -218,11 +218,10 @@ remotes::
>         "$GIT_COMMON_DIR/remotes" will be used instead.
>
>  logs::
> -       Records of changes made to refs are stored in this
> -       directory.  See linkgit:git-update-ref[1]
> -       for more information. This directory is ignored if
> -       $GIT_COMMON_DIR is set and "$GIT_COMMON_DIR/logs" will be used
> -       instead.
> +       Records of changes made to refs are stored in this directory.
> +       See linkgit:git-update-ref[1] for more information. This
> +       directory is ignored $GIT_COMMON_DIR is set and

The 'if' got lost again: s/ignored/ignored if/

> +       "$GIT_COMMON_DIR/logs" will be used instead.
>
>  logs/refs/heads/`name`::
>         Records all changes made to the branch tip named `name`.