From: Maïeul <maieul@maieul.net>
To: git@vger.kernel.org
Subject: Merging one file only
Date: Sun, 21 Aug 2011 13:33:39 -0700 (PDT) [thread overview]
Message-ID: <1313958819073-6709333.post@n2.nabble.com> (raw)
Hello,
my problem is :
- I have 2 branches : "master" and "sty"
- In the branch sty, I have commit that i don't want to merge on the branch
master. The only file that I want merge are the *dtx files.
My question is : how can i do to merge *dtx files from "sty" to "master",
and have log of commit on the *dtx ? Is it possible ?
Thank a lot !!
--
View this message in context: http://git.661346.n2.nabble.com/Merging-one-file-only-tp6709333p6709333.html
Sent from the git mailing list archive at Nabble.com.
next reply other threads:[~2011-08-21 20:34 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-21 20:33 Maïeul [this message]
2011-08-21 21:32 ` Merging one file only Michael Witten
2011-08-21 21:35 ` Maïeul Rouquette
2011-08-21 21:52 ` PJ Weisberg
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=1313958819073-6709333.post@n2.nabble.com \
--to=maieul@maieul.net \
--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