From: Jakub Narebski <jnareb@gmail.com>
To: git@vger.kernel.org
Subject: Re: How to pull only a few files from one branch to another?
Date: Wed, 24 Jan 2007 21:46:49 +0100 [thread overview]
Message-ID: <ep8ght$dlf$3@sea.gmane.org> (raw)
In-Reply-To: 20070124203913.GD4083@nan92-1-81-57-214-146.fbx.proxad.net
Yann Dirson wrote:
> What was particular about this tree, is that we are several people
> working on it, namely developpers taking care of the app, and me as
> build manager taking care of the build mechanics as well as kernel+OS.
> So the task was logically divided: one dev would merge the app, and I
> would merge everything else. As you see, it's far from one-file
> merges, but the problem is quite similar.
This I think would be best handled by (future/prototype) submodules
support.
I wonder if fake-recording resolutions in git-rerere would help
in that case...
--
Jakub Narebski
Warsaw, Poland
ShadeHawk on #git
next prev parent reply other threads:[~2007-01-24 20:50 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-24 3:24 How to pull only a few files from one branch to another? Bill Lear
2007-01-24 4:11 ` Linus Torvalds
2007-01-24 4:18 ` Linus Torvalds
2007-01-24 10:14 ` Johannes Schindelin
2007-01-24 10:16 ` Johannes Schindelin
2007-01-24 11:03 ` Bill Lear
2007-01-24 20:39 ` Yann Dirson
2007-01-24 20:46 ` Jakub Narebski [this message]
2007-01-24 21:27 ` Yann Dirson
2007-01-24 22:04 ` Jakub Narebski
2007-01-24 21:30 ` Linus Torvalds
2007-01-24 5:29 ` Daniel Barkalow
2007-01-24 6:02 ` Bill Lear
2007-01-24 6:07 ` Shawn O. Pearce
2007-01-24 14:52 ` Andy Whitcroft
2007-01-24 6:58 ` Junio C Hamano
2007-01-24 9:32 ` Jakub Narebski
2007-01-24 19:46 ` Daniel Barkalow
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='ep8ght$dlf$3@sea.gmane.org' \
--to=jnareb@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 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.