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

2010-03-31 Thread vfclists
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

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

2010-03-31 Thread Rick DeNatale
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

[git-users] Re: Does git have some kind of logging or verbose format?

2010-03-31 Thread Konstantin Khomoutov
On Mar 31, 5:25 pm, vfclists vfcli...@googlemail.com wrote: [...] When I try you suggestion, a message suggesting it is using plink to connect, yet the ssh command works fine. When I try to generate a key it also complains that the id_rsa file already exists. It looks like although it was

[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] Revert To Before A Specific Patch....

2010-03-31 Thread Jeffda
Is it possible to revert a GIT repository to what it was right before a specific patch was applied? If so, is it possible to do so with just the patch's filename or the patch itself? -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post

[git-users] How to exclude branches from git push?

2010-03-31 Thread vfclists
When I run 'git remote show origin' the output states that a git push/ pull/fetch will fetch and push a number of branches on the remote. Is there a way to push only a particular branch and ignore the others? The git branch docs show this example. *** Delete an unneeded branch $ git

[git-users] Re: Revert To Before A Specific Patch....

2010-03-31 Thread Marek Wywiał
On 31 Mar, 20:33, Jeffda daniel.viviot...@gmail.com wrote: Is it possible to revert a GIT repository to what it was right before a specific patch was applied? If so, is it possible to do so with just the patch's filename or the patch itself? You can run: * git reset --soft commitid to move

[git-users] Re: How to exclude branches from git push?

2010-03-31 Thread Marek Wywiał
On 31 Mar, 21:31, vfclists vfcli...@googlemail.com wrote: When I run 'git remote show origin' the output states that a git push/ pull/fetch will fetch and push a number of branches on the remote. Is there a way to push only a particular branch and ignore the others? The git branch docs

[git-users] Re: How to exclude branches from git push?

2010-03-31 Thread Konstantin Khomoutov
On Mar 31, 11:31 pm, vfclists vfcli...@googlemail.com wrote: When I run 'git remote show origin' the output states that a git push/ pull/fetch will fetch and push a number of branches on the remote. Is there a way to push only a particular branch and ignore the others? Yes, see the git-config

[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

Re: [git-users] How to exclude branches from git push?

2010-03-31 Thread Michael P. Soulier
On 31/03/10 vfclists said: When I run 'git remote show origin' the output states that a git push/ pull/fetch will fetch and push a number of branches on the remote. Is there a way to push only a particular branch and ignore the others? Yup. git push myremote mylocalbranch:myremotebranch

[git-users] Re: Revert To Before A Specific Patch....

2010-03-31 Thread Konstantin Khomoutov
On Apr 1, 2:51 am, Jeffda daniel.viviot...@gmail.com wrote: It would be awesome if GIT would have the capability to revert/reset to a specific date/time. Read the manual of the git-reset command (and its --hard command- line option in particular), read the manual of the git-rev-parse command