Is this what you are looking for? http://www.gitready.com/beginner/2009/01/19/ignoring-files.html
On Wed, Mar 31, 2010 at 10:07 AM, vfclists <vfcli...@googlemail.com> wrote: > > I have come to one of my main reasons for using git. > > I am creating an app which is being customzied for users. > > The idea is that the main non UI code is constant, the same across all > customized versions, but with the customized versions, the UI will > will different, some options will be disabled etc, and some of the > functions in the non UI libraries will never be called at all, > although they will be there for consistency's sake. > > So after creating branch, how do I configure it to exclude some files > from being merged or updated from the mainline version. In other words > it will be akin to having the working directory made up files from 2 > or more branches in the remote repositories, and pushes and pulls will > know which files goes where or comes from. > > I am sure git probably allows this in its feature set, but I am yet to > know the right configuration. > > -- > You received this message because you are subscribed to the Google Groups > "Git for human beings" group. > To post to this group, send email to git-us...@googlegroups.com. > To unsubscribe from this group, send email to > git-users+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/git-users?hl=en. > > -- Rick DeNatale Blog: http://talklikeaduck.denhaven2.com/ Twitter: http://twitter.com/RickDeNatale WWR: http://www.workingwithrails.com/person/9021-rick-denatale LinkedIn: http://www.linkedin.com/in/rickdenatale -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To post to this group, send email to git-us...@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.