[git-users] Re: How do you exclude files from being merged by git pull, push etc?

2010-03-31 Thread vfclists
On Mar 31, 4:20 pm, Rick DeNatale rick.denat...@gmail.com wrote: Is this what you are looking for? http://www.gitready.com/beginner/2009/01/19/ignoring-files.html Using .gitignore is something I have considered, but it looks like it is going to get more interesting than that. I will

Re: [git-users] Re: How do you exclude files from being merged by git pull, push etc?

2010-03-31 Thread Rick DeNatale
On Wed, Mar 31, 2010 at 12:11 PM, vfclists vfcli...@googlemail.com wrote: On Mar 31, 4:20 pm, Rick DeNatale rick.denat...@gmail.com wrote: Is this what you are looking for? http://www.gitready.com/beginner/2009/01/19/ignoring-files.html Using .gitignore is something I have considered,

[git-users] Re: How do you exclude files from being merged by git pull, push etc?

2010-03-31 Thread vfclists
On Mar 31, 6:03 pm, Rick DeNatale rick.denat...@gmail.com wrote: On Wed, Mar 31, 2010 at 12:11 PM, vfclists vfcli...@googlemail.com wrote: On Mar 31, 4:20 pm, Rick DeNatale rick.denat...@gmail.com wrote: Is this what you are looking for?

[git-users] Re: How do you exclude files from being merged by git pull, push etc?

2010-03-31 Thread Konstantin Khomoutov
On Mar 31, 6:07 pm, vfclists vfcli...@googlemail.com wrote: [...] 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