From: Thomas Rast <trast@inf•ethz.ch>
To: Junio C Hamano <gitster@pobox•com>
Cc: <git@vger•kernel.org>, Michael Haggerty <mhagger@alum•mit.edu>
Subject: Re: What's cooking in git.git (Jul 2013, #07; Sun, 21)
Date: Mon, 22 Jul 2013 12:39:44 +0200 [thread overview]
Message-ID: <87hafn2co6.fsf@linux-k42r.v.cablecom.net> (raw)
In-Reply-To: <7vy58zozdk.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Sun, 21 Jul 2013 23:57:43 -0700")
Junio C Hamano <gitster@pobox•com> writes:
> * tr/merge-recursive-index-only (2013-07-07) 3 commits
> - merge-recursive: -Xindex-only to leave worktree unchanged
> - merge-recursive: untangle double meaning of o->call_depth
> - merge-recursive: remove dead conditional in update_stages()
>
> What's the status of this one?
>
> I am not particularly fond of the second patch that conceptually
> allows updating working tree during a virtual merge (i.e. addition
> of o->no_worktree is fine, but there needs a way to make sure it is
> never set to false when o->depth is not zero).
Blocking on round tuits. In any case don't merge anything until we see
that it solves git-imerge's problems, so that it has a user ;-) The next
version will implement a "stateless" mode too, like Michael asked for
(not writing MERGE_HEAD, etc.).
--
Thomas Rast
trast@{inf,student}.ethz.ch
next prev parent reply other threads:[~2013-07-22 10:40 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-22 6:57 What's cooking in git.git (Jul 2013, #07; Sun, 21) Junio C Hamano
2013-07-22 7:15 ` Eric Sunshine
2013-07-22 7:32 ` Jens Lehmann
2013-07-22 7:48 ` Duy Nguyen
2013-07-22 20:47 ` Jens Lehmann
2013-07-28 17:23 ` Jens Lehmann
2013-07-22 10:39 ` Thomas Rast [this message]
2013-07-22 21:39 ` Yamada Saburo
2013-07-22 22:12 ` Junio C Hamano
2013-07-22 22:22 ` John Keeping
2013-07-22 23:13 ` Torsten Bögershausen
2013-07-24 19:03 ` Ramsay Jones
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=87hafn2co6.fsf@linux-k42r.v.cablecom.net \
--to=trast@inf$(echo .)ethz.ch \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=mhagger@alum$(echo .)mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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