From: "Joakim Tjernlund" <joakim.tjernlund@transmode•se>
To: <git@vger•kernel.org>
Subject: How to pick a commit from another git tree?
Date: Sun, 7 Oct 2007 19:31:00 +0200 [thread overview]
Message-ID: <000101c80907$d461a810$04ac10ac@Jocke> (raw)
Hi
This is probably a somewhat stupid question but I havn't had a need until now so here goes:
There is a commit in David Millers tree:
http://git.kernel.org/?p=linux/kernel/git/davem/bak-net-2.6.24.git;a=commit;h=bbb4c0c35a4c2aed5e025b668c8dfc99c5b74cff
that hasn't made it into 2.6.23, but will go into 2.6.24.
I need this fix on top of 2.6.23(once it is released).
Now I wonder how to best add this fix to my tree. Once this fix hits linus tree and I pull
linus tree, I don't wan't a conflict as I already have this fix in my tree.
Should I just pull Davids tree? Or should I cherry-pick this one commit?
Or something else?
Jocke
next reply other threads:[~2007-10-07 17:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-07 17:31 Joakim Tjernlund [this message]
2007-10-07 17:50 ` How to pick a commit from another git tree? Pierre Habouzit
2007-10-07 20:10 ` Alex Riesen
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='000101c80907$d461a810$04ac10ac@Jocke' \
--to=joakim.tjernlund@transmode$(echo .)se \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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