{"thread":{"id":"28182","subject":"Merging one file only","startedAt":"2011-08-21T20:33:39Z","lastAt":"2011-08-21T21:52:31Z","messageCount":4,"participants":["Maïeul","Michael Witten","Maïeul Rouquette","PJ Weisberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"173967","messageId":"1313958819073-6709333.post@n2.nabble.com","threadId":"28182","inReplyTo":null,"subject":"Merging one file only","fromName":"Maïeul","fromEmail":"maieul@maieul.net","sentAt":"2011-08-21T20:33:39Z","receivedAt":"2011-08-21T20:33:39Z","isPatch":false,"sender":{"key":"maieul@maieul.net","avatar":null},"body":"Hello,\n\nmy problem is :\n- I have 2 branches : \"master\" and \"sty\"\n- In the branch sty, I have commit that i don't want to merge on the branch\nmaster. The only file that I want merge are the *dtx files.\n\nMy question is : how can i do to merge *dtx files from \"sty\" to \"master\", \nand have log of commit on the *dtx ? Is it possible ?\n\nThank a lot !!\n\n\n\n--\nView this message in context: http://git.661346.n2.nabble.com/Merging-one-file-only-tp6709333p6709333.html\nSent from the git mailing list archive at Nabble.com.\n"},{"id":"173969","messageId":"CAMOZ1BvY13ynmtCkhFNU9Dc8PqwVQUrp8ham5zHrdq2vbMY5JQ@mail.gmail.com","threadId":"28182","inReplyTo":"1313958819073-6709333.post@n2.nabble.com","subject":"Re: Merging one file only","fromName":"Michael Witten","fromEmail":"mfwitten@gmail.com","sentAt":"2011-08-21T21:32:49Z","receivedAt":"2011-08-21T21:32:49Z","isPatch":false,"sender":{"key":"mfwitten@gmail.com","avatar":"https://avatars.githubusercontent.com/u/597101?v=4"},"body":"On Sun, Aug 21, 2011 at 20:33, Maïeul <maieul@maieul.net> wrote:\n> Hello,\n>\n> my problem is :\n> - I have 2 branches : \"master\" and \"sty\"\n> - In the branch sty, I have commit that i don't want to merge on the branch\n> master. The only file that I want merge are the *dtx files.\n>\n> My question is : how can i do to merge *dtx files from \"sty\" to \"master\",\n> and have log of commit on the *dtx ? Is it possible ?\n\nThere are a number of ways to do this, some more general than others.\n\nDo you know all of the names of the files for which you don't want\nassociated commits? Do the files that you don't want get changed in\nsome of the commits that you do want?\n"},{"id":"173970","messageId":"6EE456FC-9671-4CAF-9067-743AE2526717@maieul.net","threadId":"28182","inReplyTo":"CAMOZ1BvY13ynmtCkhFNU9Dc8PqwVQUrp8ham5zHrdq2vbMY5JQ@mail.gmail.com","subject":"Re: Merging one file only","fromName":"Maïeul Rouquette","fromEmail":"maieul@maieul.net","sentAt":"2011-08-21T21:35:38Z","receivedAt":"2011-08-21T21:35:38Z","isPatch":false,"sender":{"key":"maieul@maieul.net","avatar":null},"body":"\nLe 21 août 2011 à 23:32, Michael Witten a écrit :\n\n> On Sun, Aug 21, 2011 at 20:33, Maïeul <maieul@maieul.net> wrote:\n>> Hello,\n>> \n>> my problem is :\n>> - I have 2 branches : \"master\" and \"sty\"\n>> - In the branch sty, I have commit that i don't want to merge on the branch\n>> master. The only file that I want merge are the *dtx files.\n>> \n>> My question is : how can i do to merge *dtx files from \"sty\" to \"master\",\n>> and have log of commit on the *dtx ? Is it possible ?\n> \n> There are a number of ways to do this, some more general than others.\n> \n> Do you know all of the names of the files for which you don't want\n> associated commits? Do the files that you don't want get changed in\n> some of the commits that you do want?\nI found the solution \"git merge hashofcommit\". My commits one the file are only on the file, so the solution is very simple !\nThank for helping :)-\n"},{"id":"173973","messageId":"CAJsNXT=UkNT4kk1t9Ji5h_vm+ApahzaTzBwrzwPJCuWMzezw7Q@mail.gmail.com","threadId":"28182","inReplyTo":"6EE456FC-9671-4CAF-9067-743AE2526717@maieul.net","subject":"Re: Merging one file only","fromName":"PJ Weisberg","fromEmail":"pjweisberg@gmail.com","sentAt":"2011-08-21T21:52:31Z","receivedAt":"2011-08-21T21:52:31Z","isPatch":false,"sender":{"key":"pjweisberg@gmail.com","avatar":"https://gravatar.com/avatar/e585568071f361126c42f73b11bee72fc6d4bdfea34be29faa52e621da3517eb?d=mp&s=160"},"body":"On Sunday, August 21, 2011, Maïeul Rouquette <maieul@maieul.net> wrote:\n>\n> Le 21 août 2011 à 23:32, Michael Witten a écrit :\n>\n>> On Sun, Aug 21, 2011 at 20:33, Maïeul <maieul@maieul.net> wrote:\n>>> Hello,\n>>>\n>>> my problem is :\n>>> - I have 2 branches : \"master\" and \"sty\"\n>>> - In the branch sty, I have commit that i don't want to merge on the branch\n>>> master. The only file that I want merge are the *dtx files.\n>>>\n>>> My question is : how can i do to merge *dtx files from \"sty\" to \"master\",\n>>> and have log of commit on the *dtx ? Is it possible ?\n>>\n>> There are a number of ways to do this, some more general than others.\n>>\n>> Do you know all of the names of the files for which you don't want\n>> associated commits? Do the files that you don't want get changed in\n>> some of the commits that you do want?\n> I found the solution \"git merge hashofcommit\". My commits one the file are only on the file, so the solution is very simple !\n> Thank for helping :)-\n\nGood if the commits you don't want come *after* the commits you do\nwant.  Use \"git cherry-pick <hash>\" if you want one commit and *not*\nall the commits leading up to it.\n"}]}