From: Eric Sunshine <sunshine@sunshineco.com>
Date: Sun, 23 Feb 2014 09:07:40 GMT
Subject: Re: [PATCH v2 3/8] merge-recursive: -Xindex-only to leave worktree unchanged
Message-ID: <CAPig+cSWhbunMtQ8=sXqwR7Ps+c0DY2SqVKpu_draaieSJrEPA@mail.gmail.com>
In-Reply-To: <2e56b258bca6cf83c322da4be85c42c7b54f6a3e.1393059605.git.tr@thomasrast.ch>

On Sat, Feb 22, 2014 at 4:17 AM, Thomas Rast <tr@thomasrast.ch> wrote:
> Using the new no_worktree flag from the previous commit, we can teach
> merge-recursive to leave the worktree untouched.  Expose this with a
> new strategy option so that scripts can use it.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
> diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
> index fb6e593..2934e99 100644
> --- a/Documentation/merge-strategies.txt
> +++ b/Documentation/merge-strategies.txt
> @@ -92,6 +92,10 @@ subtree[=<path>];;
>         is prefixed (or stripped from the beginning) to make the shape of
>         two trees to match.
>
> +index-only;;

s/;;/::/

> +       Write the merge result only to the index; do not touch the
> +       worktree.
> +
>  octopus::
>         This resolves cases with more than two heads, but refuses to do
>         a complex merge that needs manual resolution.  It is