All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Miklos Vajna <vmiklos@frugalware.org>
Cc: git@vger.kernel.org, Stephan Beyer <s-beyer@gmx.net>
Subject: Re: [PATCH] merge-recursive: move the global obuf to struct merge_options
Date: Thu, 04 Sep 2008 12:05:50 -0700	[thread overview]
Message-ID: <7vr67z3f5d.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: cover.1220463034.git.vmiklos@frugalware.org

Miklos Vajna <vmiklos@frugalware.org> writes:

> These, and the 4 other related patches which are not yet in git.git at
> the moment are also available in the 'merge-recursive' branch of
> git://repo.or.cz/git/vmiklos.git.

Thanks.

I already expressed my doubts about "move make_virtual_commit()".

"add merge-recursive to LIB_H" should go to 'maint' as a build-fix, so it
does not have to be on this topic.  If this is meant to be a pullable
topic branch, I'd prefer if you didn't have that commit.

I cherry picked call-depth, index-only removal, obuf and current_{f/d}
but haven't pushed the results out.

      parent reply	other threads:[~2008-09-04 19:07 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-08-19  9:05 What's cooking in git.git (Aug 2008, #05; Tue, 19) Junio C Hamano
2008-08-19 11:02 ` Johannes Sixt
2008-08-19 12:35   ` Andreas Färber
2008-08-19 12:54 ` Miklos Vajna
2008-08-19 19:19   ` Junio C Hamano
2008-08-19 20:59     ` Miklos Vajna
2008-08-19 22:00       ` Junio C Hamano
2008-08-20 22:42         ` Miklos Vajna
2008-08-25  1:44         ` [PATCH] merge-recursive: introduce merge_options Miklos Vajna
2008-08-25  6:06           ` Junio C Hamano
2008-08-25 14:25             ` Miklos Vajna
2008-08-28  4:50               ` Junio C Hamano
2008-08-30 15:42               ` [PATCH] merge-recursive: fix subtree merge Miklos Vajna
2008-08-30 16:39                 ` Junio C Hamano
2008-08-30 17:55                 ` Junio C Hamano
2008-08-31 23:49                   ` Miklos Vajna
2008-09-01  1:06         ` What's cooking in git.git (Aug 2008, #05; Tue, 19) Miklos Vajna
2008-09-01  1:09           ` [PATCH] builtin-revert: use merge_recursive_generic() Miklos Vajna
2008-09-02 20:02           ` What's cooking in git.git (Aug 2008, #05; Tue, 19) Junio C Hamano
2008-09-02 20:43             ` Junio C Hamano
2008-09-02 22:05             ` [PATCH 0/2] Move call_depth and index_only to struct merge_options Miklos Vajna
2008-09-02 22:05               ` [PATCH 1/2] merge-recursive: move call_depth " Miklos Vajna
2008-09-02 22:13                 ` [PATCH] Makefile: add merge_recursive.h to LIB_H Miklos Vajna
2008-09-02 22:39                   ` Junio C Hamano
2008-09-02 23:49                     ` Miklos Vajna
2008-09-02 22:05               ` [PATCH 2/2] merge-recursive: move index_only to struct merge_options Miklos Vajna
2008-09-02 22:39               ` [PATCH 0/2] Move call_depth and " Junio C Hamano
2008-09-03  0:16                 ` [PATCH] merge-recursive: get rid of the index_only global variable Miklos Vajna
2008-09-03  0:39                 ` [PATCH] merge-recursive: move the global obuf to struct merge_options Miklos Vajna
2008-09-03 17:34                   ` Miklos Vajna
2008-09-03 17:34                     ` [PATCH 1/2] merge-recursive: move current_{file,directory}_set " Miklos Vajna
2008-09-03 17:34                     ` [PATCH 2/2] merge-recursive: move make_virtual_commit()'s virtual_id to merge_options Miklos Vajna
2008-09-04 19:03                       ` Junio C Hamano
2008-09-05 17:26                         ` [PATCH] merge-recursive: get rid of virtual_id Miklos Vajna
2008-09-04 19:05                     ` Junio C Hamano [this message]

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=7vr67z3f5d.fsf@gitster.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=s-beyer@gmx.net \
    --cc=vmiklos@frugalware.org \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.