Re: [git-users] newbie questions

2013-07-04 Thread Dale R. Worley
> From: Ed Pataky > > Can you have multiple access points within a repo? > > What I mean is, suppose i have a repo accessing: > ./DIR/ > > And I want some people to access > ./DIR/FOLDER1/ > and other to access > ./DIR/FOLDER2/ > > But I want access to the whole thing .. can I make each folder

Re: [git-users] newbie questions

2013-07-03 Thread Ed Pataky
Can you have multiple access points within a repo? What I mean is, suppose i have a repo accessing: ./DIR/ And I want some people to access ./DIR/FOLDER1/ and other to access ./DIR/FOLDER2/ But I want access to the whole thing .. can I make each folder including the parent folder DIR a git repo,

Re: [git-users] newbie questions

2013-06-29 Thread Ed Pataky
If I setup a bare repo, and all developers track their changes, all is good .. but then one developer makes a bunch of changes that were not tracked and files are out of sync .. how do i tell GIT to revert back to the old file versions when everything was ok? On Sat, Jun 29, 2013 at 8:15 AM, Ed P

Re: [git-users] newbie questions

2013-06-29 Thread Ed Pataky
thank you very helpful i am seeing everywhere that a bare repo is the way to go for distributed developers .. it seems to me we should essentially make a rule that you make your changes and test locally if possible, then ftp them to the server when ok ... once all done the next step is (i am choos

Re: [git-users] newbie questions

2013-06-29 Thread aft
You have some fundamental misconception about how git works. 1. Its not a deploying tool. Your git server is only meant for "providing a neat way" to synchronize everyone's work. Not for deployment. Best idea is to make your release tarballs from your local dev machine and ftp it into the server.

Re: [git-users] newbie questions

2013-06-29 Thread Ed Pataky
Gergely you said "Again, you can only do this if you don't need the source files to be present on the server, or you can clone it to a separate directory to access, test or serve them." ... I do not understand this .. why cant the files be on the server? I have a std web server with web files ..

Re: [git-users] newbie questions

2013-06-29 Thread Ed Pataky
If I am working with a bare repo, can any number of people be pushing changes to the same master branch? or do they all need to make a new branch and eventually merge them? my understanding is that with a bare repo, multiple developers can commit and push to the same master branch On Sat, J

Re: [git-users] newbie questions

2013-06-29 Thread Ed Pataky
Question: lets say i want to go with the bare repo idea ... i set one up, i cloned it to my pc .. ok cool Now what if i typically work on files ABC and my developers work on DEF ... do i need to add all the files A-F to my machine, or can i just add the ones i need to work on ? ... in other words

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
So suppose i have a git repo setup, and someone adds a file that should not be there, or deletes a file they should not have, through ssh or ftp ... how do i go about reversing their change back to the last commit point? On Fri, Jun 28, 2013 at 1:58 PM, John McKown wrote: > You can roll back to

Re: [git-users] newbie questions

2013-06-28 Thread Magnus Therning
On Fri, Jun 28, 2013 at 02:06:38PM -0700, Ed Pataky wrote: > Thank you ... about "git add" i thought once you add the file you > never have to do that again? ... doesn't "add" tell git to track the > file? and if so, why do you have to do it again? Many VCSs work the way you mention above, you add

Re: [git-users] newbie questions

2013-06-28 Thread Magnus Therning
On Fri, Jun 28, 2013 at 11:14:06AM -0700, HWSWMAN wrote: > Ok, I want to start over after having spent a few hours trying > things ... > > Here is my situation ... I need to use GIT for some source control > .. i have never used any source control before and I want to use it > in the simplest pos

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
finally got the CLR error fixed, here is the fix: https://github.com/Windower/Issues/issues/170 On Fri, Jun 28, 2013 at 2:06 PM, Ed Pataky wrote: > Thank you ... about "git add" i thought once you add the file you never > have to do that again? ... doesn't "add" tell git to track the file? and

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
Thank you ... about "git add" i thought once you add the file you never have to do that again? ... doesn't "add" tell git to track the file? and if so, why do you have to do it again? ed On Fri, Jun 28, 2013 at 1:58 PM, John McKown wrote: > You can roll back to any commit point. You can roll ba

Re: [git-users] newbie questions

2013-06-28 Thread John McKown
Ah. Sounds like you are running MS-Windows? Sorry, but "I don't _do_ windows!" (as I used to say as a maintenance worker in college ). I am a Linux bigot. On Fri, Jun 28, 2013 at 3:53 PM, Ed Pataky wrote: > question: i have installed now 4 different GIT GUIs and all of them break > with an erro

Re: [git-users] newbie questions

2013-06-28 Thread John McKown
You can roll back to any commit point. You can roll back all changes to that point. Or one or more files. Or just look at the contents of a file as of that commit point. Perhaps I misunderstood, but I got the impression you thought that git would automatically keep every change made to a file witho

Re: [git-users] newbie questions

2013-06-28 Thread Dale R. Worley
> From: Ed Pataky > > the downside of this seems to be that all the developers/contributors have > to know how to merge correctly Yeah, but that's true of any version control system that does not have a centralized locking system to prevent two developers from changing a single file simultaneous

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
question: i have installed now 4 different GIT GUIs and all of them break with an error that says "CLR error" ... blah blah ... i saw online this meant .NET was not installed, i installed 10 times ... nothing works .. the only gui that works is the GIT GUI but it is not very good ... any help on t

Re: [git-users] newbie questions

2013-06-28 Thread Dale R. Worley
> From: Ed Pataky > > One thing I am concerned about is that it seems like there is no protection > from someone in via ftp and changing files .. i assumed that version > control meant that the files are protected .. why doesn't git protect the > files? What i mean is, this seems to only work if

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
So you are saying that there is no way to rollback to an old version using git? what is the point then, just to store a bunch of comments? On Fri, Jun 28, 2013 at 12:59 PM, John McKown wrote: > I will have to note that you seem to have a non-standard definition of > version control. git, and ot

Re: [git-users] newbie questions

2013-06-28 Thread John McKown
I will have to note that you seem to have a non-standard definition of version control. git, and other version control software such as Subversion, Mercurial, CVS, Visual Source Safe (or whatever MS calls it), don't track all changes to every file every time the file is modified. They only supply c

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
One thing I am concerned about is that it seems like there is no protection from someone in via ftp and changing files .. i assumed that version control meant that the files are protected .. why doesn't git protect the files? What i mean is, this seems to only work if everyone does it correctly ..

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
the downside of this seems to be that all the developers/contributors have to know how to merge correctly On Fri, Jun 28, 2013 at 11:45 AM, Ed Pataky wrote: > ok i have to try this thank you > > ed > > > On Fri, Jun 28, 2013 at 11:38 AM, Dale R. Worley wrote: > >> Generally, for simple projects

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
ok i have to try this thank you ed On Fri, Jun 28, 2013 at 11:38 AM, Dale R. Worley wrote: > Generally, for simple projects with multiple developers, the pattern > is to have one central "bare" repository that is the "official" copy > of all the commits. > > Each developer then has their own re

Re: [git-users] newbie questions

2013-06-28 Thread Dale R. Worley
Generally, for simple projects with multiple developers, the pattern is to have one central "bare" repository that is the "official" copy of all the commits. Each developer then has their own repository with an attached working directory. Each repository is created as a "clone" of the central rep

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
ok about the usernames, in general yes i know this is not ideal .. it just happened this way because the developers needed SSH access to everything essentially so they could mess with things that needed full control ... i think because the ssh password on the server is locked to one single ftp acco

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
Thank you, I did try this but I was confused ... The files are on the server, these are the production files .. they have to be there or there is no website ... so can i still use a bare repo? My understanding of this is that a bare repo simply has the history info (branches, commits, etc) .. but

Re: [git-users] newbie questions

2013-06-28 Thread Dale R. Worley
> From: HWSWMAN > > i have a linux server with our website files, and i have me, plus a few > developers in another country ... myself and the developers share the same > SSH access username That is generally a bad idea, because then the access of a single developer cannot be revoked without r

Re: [git-users] newbie questions

2013-06-28 Thread Gergely Polonkai
Hello, if I was you, I would use a bare repository on the server side. This will render the server's repository unreadable for the human eye, but the server-side merging would become unnecessary. To do this, create a new directory on the server, and issue the command git init --bare in it. After

Re: [git-users] newbie questions

2013-06-28 Thread HWSWMAN
Ok, I want to start over after having spent a few hours trying things ... Here is my situation ... I need to use GIT for some source control .. i have never used any source control before and I want to use it in the simplest possible way first, to get running, and have some version control goi

Re: [git-users] newbie questions

2013-06-28 Thread HWSWMAN
question: going to the server and trying to do a merge with "VIM" is very terrible ... can't i see the merge and do it locally from my PC using the GIT GUI? I need a GUI basically, i hate command line stuff ... how i can i do the merge on the server, but from my PC in a (free) GUI -- You rec

Re: [git-users] newbie questions

2013-06-28 Thread HWSWMAN
ok i get it ... the file did ftp, i had to go on the server and merge it -- You received this message because you are subscribed to the Google Groups "Git for human beings" group. To unsubscribe from this group and stop receiving emails from it, send an email to git-users+unsubscr...@googlegrou

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
I made a new branch, made changes, commited, pushed .. all good .. why did the file not ftp to the server? On Fri, Jun 28, 2013 at 9:33 AM, Ed Pataky wrote: > Thank you .. question: I created a git repo on the server ... > > than on my machine i cloned the repo > > i made some changes, stage,

Re: [git-users] newbie questions

2013-06-28 Thread Ed Pataky
Thank you .. question: I created a git repo on the server ... than on my machine i cloned the repo i made some changes, stage, commit, then push ... it says master is checked out? Should I have made a branch first? Why can I not push these changes? How should I push them, or what is the proce

Re: [git-users] newbie questions

2013-06-28 Thread Magnus Therning
On Fri, Jun 28, 2013 at 4:30 AM, HWSWMAN wrote: > ok i am new to GIT .. i need a source control system and i want to use it in > the simplest possible way ... > > i have a linux server with our website files, and i have me, plus a few > developers in another country ... myself and the developers s

[git-users] newbie questions

2013-06-27 Thread HWSWMAN
ok i am new to GIT .. i need a source control system and i want to use it in the simplest possible way ... i have a linux server with our website files, and i have me, plus a few developers in another country ... myself and the developers share the same SSH access username i got started and c