On Wed, Oct 7, 2015 at 9:33 AM, Andreas Schwab <sch...@linux-m68k.org> wrote: > Rudy YAYON <rudy.yayon....@boursorama.fr> writes: > >> My concern is that one important file (Puppetfile) needs to be pushed to >> my remote repository so I can check the changes I commited. >> To do that, I need to commit changes (included to the Puppetfile) then I >> need to push it to the remote repository. >> >> Once I want to merge these changes from a specific branch to the master >> branch, I do NOT want to include this file. In other words, I want to merge >> all files except the Puppetfile file. >> >> What is the best way for you to do that? > > Create a branch that does not include the file. > > Andreas. >
Why do the changes to "Puppetfile" need to be pushed to your github? Just test it locally and then push it and pull-request a commit which doesn't have those changes in it. Regards, Jake -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
