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. -- Andreas Schwab, sch...@linux-m68k.org GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- 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
