On Sun, Aug 21, 2011 at 20:33, Maïeul <maieul@xxxxxxxxxx> 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? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html