Merging one file only

Merging one file only

[Maïeul]

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.

Re: Merging one file only

[Michael Witten]

On Sun, Aug 21, 2011 at 20:33, Maïeul <maieul@maieul.net> wrote:
> 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 ?

There are a number of ways to do this, some more general than others.

Do you know all of the names of the files for which you don't want
associated commits? Do the files that you don't want get changed in
some of the commits that you do want?

Re: Merging one file only

[Maïeul Rouquette]

Le 21 août 2011 à 23:32, Michael Witten a écrit :

> On Sun, Aug 21, 2011 at 20:33, Maïeul <maieul@maieul.net> wrote:
>> 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 ?
> 
> There are a number of ways to do this, some more general than others.
> 
> Do you know all of the names of the files for which you don't want
> associated commits? Do the files that you don't want get changed in
> some of the commits that you do want?
I found the solution "git merge hashofcommit". My commits one the file are only on the file, so the solution is very simple !
Thank for helping :)-

Re: Merging one file only

[PJ Weisberg]

On Sunday, August 21, 2011, Maïeul Rouquette <maieul@maieul.net> wrote:
>
> Le 21 août 2011 à 23:32, Michael Witten a écrit :
>
>> On Sun, Aug 21, 2011 at 20:33, Maïeul <maieul@maieul.net> wrote:
>>> 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 ?
>>
>> There are a number of ways to do this, some more general than others.
>>
>> Do you know all of the names of the files for which you don't want
>> associated commits? Do the files that you don't want get changed in
>> some of the commits that you do want?
> I found the solution "git merge hashofcommit". My commits one the file are only on the file, so the solution is very simple !
> Thank for helping :)-

Good if the commits you don't want come *after* the commits you do
want.  Use "git cherry-pick <hash>" if you want one commit and *not*
all the commits leading up to it.