From: Eric Sunshine <sunshine@sunshineco.com>
To: Thomas Rast <tr@thomasrast.ch>
Cc: Git List <git@vger.kernel.org>,
Junio C Hamano <gitster@pobox.com>,
Thomas Rast <trast@inf.ethz.ch>
Subject: Re: [PATCH v2 3/8] merge-recursive: -Xindex-only to leave worktree unchanged
Date: Sun, 23 Feb 2014 04:07:40 -0500 [thread overview]
Message-ID: <CAPig+cSWhbunMtQ8=sXqwR7Ps+c0DY2SqVKpu_draaieSJrEPA@mail.gmail.com> (raw)
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
next prev parent reply other threads:[~2014-02-23 9:08 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-22 9:17 [PATCH v2 0/8] log --remerge-diff Thomas Rast
2014-02-22 9:17 ` [PATCH v2 1/8] merge-recursive: remove dead conditional in update_stages() Thomas Rast
2014-02-22 9:17 ` [PATCH v2 2/8] merge-recursive: internal flag to avoid touching the worktree Thomas Rast
2014-02-22 9:17 ` [PATCH v2 3/8] merge-recursive: -Xindex-only to leave worktree unchanged Thomas Rast
2014-02-23 9:07 ` Eric Sunshine [this message]
2014-02-23 11:57 ` Thomas Rast
2014-02-23 18:42 ` Eric Sunshine
2014-02-22 9:17 ` [PATCH v2 4/8] combine-diff: do not pass revs->dense_combined_merges redundantly Thomas Rast
2014-02-22 9:17 ` [PATCH v2 5/8] Fold all merge diff variants into an enum Thomas Rast
2014-02-22 9:17 ` [PATCH v2 6/8] merge-recursive: allow storing conflict hunks in index Thomas Rast
2014-02-22 9:17 ` [PATCH v2 7/8] name-hash: allow dir hashing even when !ignore_case Thomas Rast
2014-02-23 9:19 ` Eric Sunshine
2014-09-06 17:46 ` Thomas Rast
2014-02-27 23:20 ` Junio C Hamano
2014-02-22 9:17 ` [PATCH v2 8/8] log --remerge-diff: show what the conflict resolution changed Thomas Rast
2014-02-27 0:40 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPig+cSWhbunMtQ8=sXqwR7Ps+c0DY2SqVKpu_draaieSJrEPA@mail.gmail.com' \
--to=sunshine@sunshineco.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tr@thomasrast.ch \
--cc=trast@inf.ethz.ch \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).