From: Chris Packham <judge.packham@gmail.com>
To: GIT <git@vger.kernel.org>
Subject: Re: re-running merge on a single file
Date: Thu, 11 Mar 2010 11:09:16 -0800 [thread overview]
Message-ID: <a038bef51003111109w2b4feaeeg120383a0645a0a7@mail.gmail.com> (raw)
In-Reply-To: <a038bef51003111054n5bcecd2eud531dcc80509f952@mail.gmail.com>
Answering my own question.
On Thu, Mar 11, 2010 at 10:54 AM, Chris Packham <judge.packham@gmail.com> wrote:
> Alternatively I could manually drive and external merge tool like
> kdiff3 if I had a recipe for getting the common ancestor revision.
> Something like
>
> git checkout <magic pathspec> -- file
> mv file file.base
git checkout $(git merge-base master vendor) -- file
Still if anyone has a cleaner way of doing this I'd like to hear it.
It especially like a one-shot get file X from revision Y save as Z.
next prev parent reply other threads:[~2010-03-11 19:09 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 [this message]
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
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=a038bef51003111109w2b4feaeeg120383a0645a0a7@mail.gmail.com \
--to=judge.packham@gmail.com \
--cc=git@vger.kernel.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 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).