[git-users] merge two repos?
I have a directory ./MAIN/ with /A/ and /B/ under MAIN ./MAIN/ ./MAIN/A/ ./MAIN/B/ A and B have their own repos ... i want to combine them so i have a repo under MAIN, while keeping the history of A and B ... how can i do this? i use sourcetree if any specific help using sourcetree is possible .. otherwise i am somewhat comfortable using command line git then opening that in sourcetree later .. any help is appreciated -- 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...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] git users and permissions
i created a repo on a server, and i followed instructions to make a new git group, and assign users to the group .. then i set it so the shell is git shell, and the users can only access the files through git .. this is great .. now, can i create a user that can only pull? that would be great -- 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...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] reverting back
suppose i have a directory with many files .. i commit a good version .. then i make a bunch of changes and i messed something up .. how do i revert back to the old version? will all the files be replaced from the current messed up files to the older good files? i am using SourceTree -- 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...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] lots of files
i want to setup git for my entire team, tons of files, many directories, etc ... i do NOT want everyone to clone all these files to their machine, but if they make changes, i want to track them ... for example on a shared drive there are many projects, each project has many folders with different files, etc ... should i make repos for every subdirectory under the main one? what is the best way to do this? -- 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...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Do I have to download all files?
If I create a git repo for multiple projects, for example ALL projects that my team works on, when they clone and pull, do they have to download all the files? Can they sort of selectively download the files they may want to read or work on? The idea is I want to track a bunch of projects for my team ... so i was thinking to make a repo that contains something like this: ./MyTEAM/ ./MyTEAM/Project_A/ ./MyTEAM/Project_A/Some_Files/ ./MyTEAM/Project_A/Some_More_Files/ ./MyTEAM/Project_B/ ./MyTEAM/Project_C/ Then the entire team can contribute to any of the projects they may be working on, but they should not have to download every single file when they clone .. is that possible? Basically I do not want to have to create a repo for every single project .. is that what people normally do? -- 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...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
[git-users] Re: Do I have to download all files?
I am also wondering, if everyone clones the repo so they can start contributing, then there are like 10 copies of the project files going around .. isn't that a waste? Is there a better way? Please help explain I am using for the first time -- 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...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] newbie questions
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...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] newbie questions
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 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...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
Re: [git-users] newbie questions
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 going on ... i have a very small team of only a few people, but in different locations. I read some stuff and this is what I am planning on doing, please tell me if this makes sense: - I went on the server and used git init to create a new repo - added some files and directories, and commited them from the server - i installed and opened GIT GUI, simple and free, this is what i want ... i cloned the repo to my local machine ... all good - now my understanding is that on the server is the master branch, so all the developers who develop locally on their machines, should create a branch so that they can push ... i created a branch on my machine called company-name-desc, I will recommend all the developers to do this - I made some changes to files in the repo, staged, and commited ... all good ... i also pushed and no issues ... - Now I notice i have to go to the server to merge the changes so the files actually show up on the web server ... worked fine .. - So the idea is, since this all worked, that i would tell the developers to (1) clone the repo (2) create a branch to work out of (3) do their development and stage and commit changes locally, then push to the server ... (4) then they should tell me they need me to merge the branch, and I would ask for the branch name ... i would then go to the server and merge the changes - Does this all sound good so far? Will it work fine? ... - Now if yes, if there is an issue, how do i roll back a change? .. can i simply issue a command on the server, and have the files roll back to the state before the last merge? How do i do this? Otherwise please let me know if this is not right in some way how i am thinking ... note i do not care if i do not have the 110% most optimal way of doing things, i just need a simple method to have some control, and some tracking for now .. this seems to work and i just want some verification .. i am sure more experienced users have suggestions as to how to make this better/smoother/more efficient, and I welcome that too, but please do not just say i am wrong because you know more than i do and you know a fancier way .. what i want to know is if this above is reasonable, and if it will work for basic tracking and control of source files ... Thank you -- 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...@googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.
