From: Kris Shannon <kris@shannon.id.au>
To: Chris Packham <judge.packham@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>, GIT <git@vger.kernel.org>
Subject: Re: re-running merge on a single file
Date: Sun, 14 Mar 2010 23:24:39 +1100 [thread overview]
Message-ID: <e51f4f551003140524r18546bd6i202f1b886de9d7a9@mail.gmail.com> (raw)
In-Reply-To: <a038bef51003121543t52a864ddlab345dd1bcf6c906@mail.gmail.com>
On 13 March 2010 10:43, Chris Packham <judge.packham@gmail.com> wrote:
> On Fri, Mar 12, 2010 at 3:07 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> (3) If you have rerere enabled, then the conflicts would be already
>> resolved in your working tree at this point, but not in the index, so
>> you can reproduce the conflicted state with "checkout -m".
>
> Mental note: Need to learn more about git rerere. Sounds like what I
> need to do the job.
>
There is a script in the contrib directory written by Nanako Shiraishi called
rerere-train.sh which can be used to prime the rr-cache even if you didn't
have rerere enabled before you orginally did the merge.
next prev parent reply other threads:[~2010-03-14 12:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-11 18:54 re-running merge on a single file Chris Packham
2010-03-11 19:09 ` Chris Packham
2010-03-11 20:29 ` Markus Heidelberg
2010-03-11 22:08 ` Chris Packham
2010-03-11 23:20 ` Jakub Narebski
[not found] ` <a038bef51003111631n38f7e50cp79d8335109f3ed0@mail.gmail.com>
2010-03-12 0:33 ` Chris Packham
2010-03-12 6:45 ` Johannes Sixt
2010-03-12 6:56 ` Junio C Hamano
2010-03-12 20:16 ` Chris Packham
2010-03-12 21:16 ` Chris Packham
2010-03-12 23:07 ` Junio C Hamano
2010-03-12 23:43 ` Chris Packham
2010-03-14 12:24 ` Kris Shannon [this message]
2010-03-12 9:00 ` Jakub Narebski
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=e51f4f551003140524r18546bd6i202f1b886de9d7a9@mail.gmail.com \
--to=kris@shannon.id.au \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=judge.packham@gmail.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 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).