I have inherited a git repository containing multiple projects in separate directories. I'd like to split the repository into new individual repositories, one for each project and then have the master repository contain the projects as submodules. I'd like to do all this whilst maintaining the revision history of the individual projects ...
Duplicates: http://stackoverflow.com/questions/740053/why-should-i-use-git-instead-of-svn http://stackoverflow.com/questions/161541/svn-vs-git http://stackoverflow.com/questions/871/why-is-git-better-than-subversion I'm sure I've asked it wrong but I read that Git doesn't use a central repository like SVN does. One, I don't underst...
I'm currently working in a team where we're "using" a subversion repository. I say "using", because in reality, everyone's just editing files directly on a server through samba shares, while every once in a while our architect does a commit from that server with our changes, which are then pushed out to servers. So basically we're missi...
I am trying to merge different versions of the same file in git for one of my projects. The only way git will let me do this is by branching the repo, modifying the file, and then pulling the branch into my master. The only problem is, my project contains 100's of files and I only need this one. Is there any way to pull from a branch con...
A co-worker and I are both working on the master branch at the moment. I have some code in my working tree that I don't want to commit (debugging statements and the like). Now if he commits changes to some of those same files, I can't merge them: $ git merge origin/master Updating 1b8c5c6..eb44c23 error: Entry 'blah.java' not uptodate...
I've read somewhere (I dont recall exactly where) that Git (and probably any other good DCVS) is an excellent tool when you're translating some text. I'm trying to figure out a workflow for this scenario, and the best I could get was something like: Use your own branch. Translate files as usual, commit as needed. When there are change...
Setting up a project is easy in git and so I can have separate repository even for small script. Now the problem is how to manage them. I work in multiple places with these repositories. When I have done changes to some repository, I want to be able to update the repositories in other places. So I have a directory with many repositorie...
I wanted to use one of the Git-completion.bash features but I can't customize the look I'd like to have. Here is relevant part of my .bash_profile: source ~/.git-completion.bash function prompt { local WHITE="\[\033[1;37m\]" local GREEN="\[\033[0;32m\]" local CYAN="\[\033[0;36m\]" local GRAY="\[\033[0;37m\]" local BLUE="\[\033[0;34m\]"...
Hi, I'm working on a local repo, theres 2 branches, the master and the feature_x I wanna push feature_x to remote, but dont wanna push the changes on master branch. Doing a "git push origin feature_x" from my feature_x branch (feature_x branch already exists on remote) will work? I just don't wanna test this on my box, because I can'...
I'm trying to exclude subversion's folders from being tracked by git. I tried a couple different setups for .git/info/exclude, but it doesn't seem to work. I would use git-svn, but it's a pain to request access to get that to work, so I'd rather just work around this by excluding the folders. I want to exclude ".svn/entries" I've tried...
I want to merge two branches that have been separated for a while and wanted to know which files have been modified. Came across this link: http://linux.yyz.us/git-howto.html which was quite useful. The tools to compare branches I've come across are: git diff master..branch git log master..branch git shortlog master..branch Was won...
I have installed git and gitosis and I need to add a check that the user name is valid when something is pushed into the repository. I reckon the pre-receive hook is the correct hook to place this, but I'm unable to find the real user name and email address which gitosis enters into the repository (the ones set by git config user.name ...
I'm trying to use Araxis Merge as my diff / merge tool for MSYSGit. I found a few resources on the net: On the Araxis site, they mention an "easy" way, but it implies a executables (araxisgitdiff.exe and araxisgitmerge.exe) that are not part of my distro. I also found some info in gitguru, but the actual information re: Araxis is spar...
I have a git superproject that references several submodules and I am trying to lock down a workflow for the rest of the my project members to work within. For this question, lets say my superproject is called supery and the submodule is called subby. (Then is a simplification of what I'm trying to do...I'm not actually using the branch...
I work with software that is kept in svn for version control. I would like to use git (git-svn) however the software requires lots of setup and configuration before it can be used. There are tools that take care of all of the setup, including checking out all the code via svn. All the documentation for git-svn (I've been able to find) r...
I just started using git with github. I followed their instructions and ran into errors on the last step. I'm checking in an existing directory that isn't currently source-controlled (project about a week old). Other than that, my use case should be pretty run of the mill. Here's what's happening: $ git push origin master error: src re...
I'd like to know how to check if something is committed to a repository through git. The idea is to take the committed files into a code review tool. ...
I'm interested in trying out distributed version control systems. git sounds promising, but I saw a note somewhere for the Windows port of git that says "don't use non-ASCII filenames". I can't find that now, but there is this link. It's put me off git for now, but I don't know if the other options are any better. Support for non-ASCII ...
I need to insert a commit in the master branch of my git repository whist preserving the subsequent merges and commits. I currently have something like this A--B--C--D--E--F master \ \ G--H I--J branches and need to insert a commit K such that the new structure becomes A--B--K master \ ...
What would possibly cause a 'git push' to try and commit to two branches? I have my own branch I'm working on, which is on the shared repo... and a master branch. Right now I just wanted to push to my personal branch which went through just fine, but it also tried to push to master and got rejected. Looked something like this: foo$ git ...