All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Catalin Marinas" <catalin.marinas@gmail.com>
To: "Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org
Subject: Re: [StGit PATCH 1/2] Do simple in-index merge with diff+apply instead of read-tree
Date: Sat, 12 Jul 2008 11:22:00 +0100	[thread overview]
Message-ID: <b0943d9e0807120322l350784b5sfceeb967f0956cdb@mail.gmail.com> (raw)
In-Reply-To: <20080702061243.11361.75544.stgit@yoghurt>

2008/7/2 Karl Hasselström <kha@treskal.com>:
> The advantage is that patch application will resolve some file content
> conflicts for us, so that we'll fall back to merge-recursive less
> often. This is a significant speedup, especially since merge-recursive
> needs to touch the worktree, which means we have to check out the
> index first.

Thanks.

-- 
Catalin

  reply	other threads:[~2008-07-12 10:23 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-02  6:12 [StGit PATCH 0/2] push optimizations Karl Hasselström
2008-07-02  6:12 ` [StGit PATCH 1/2] Do simple in-index merge with diff+apply instead of read-tree Karl Hasselström
2008-07-12 10:22   ` Catalin Marinas [this message]
2008-07-02  6:13 ` [StGit PATCH 2/2] Reuse the same temp index in a transaction Karl Hasselström
2008-07-03 21:38   ` [StGit PATCH v2] " Karl Hasselström
2008-07-12 10:24   ` [StGit PATCH 2/2] " Catalin Marinas
2008-07-14  6:35     ` Karl Hasselström
2008-07-07 21:12 ` [StGit PATCH 0/2] push optimizations Catalin Marinas
2008-07-08  4:36   ` Karl Hasselström

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=b0943d9e0807120322l350784b5sfceeb967f0956cdb@mail.gmail.com \
    --to=catalin.marinas@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=kha@treskal.com \
    /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.