I know how to make a new branch that tracks remote branches. But how do I make an existing branch track a remote branch. I know I can just edit the .git/config file but it seems there should be an easier way. EDIT It looks like this can't currently be done in a convenient way with the current (1.6.1.x) version of Git. UPDATE Git vers...
Arguing with a friend of mine — I am advocating git/hg, he is advocating CLOBs MySQL. What is your preference? ...
Git newbie here. Is there a way to synchronize two repositories, so that the current checked out files will be the latest version of all the changes? What I have is this: Desktop Server ------- ------ Change_X Change_Y And I would like to enter some "magic" command, and then the changes are merged Desktop Serv...
While attempting to get an old svn dump of a project under git control, I ran into an interesting problem. Whenever I run git svn, I get an error saying it isn't a git command, yet there is documentation for it that I can pull up using git help. Is there something wrong with my install, or am I just missing something here? Edit: I sh...
After git clone, the config in the new repo looks like: remote.origin.url=<some url> remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* branch.master.remote=origin branch.master.merge=refs/heads/master Then, I can execute "git pull" and "git push". But I'm interested in only do "git pull", because I want to push into another repo...
Is there any way to specify to git to automatically resolve the conflicts for a pack of files by taking the remote version for each of them? For instance, to take the remote version of each files in a certain directory? ...
I'm moving a git repository from my Linux machine to a Windows machine. I was hoping to just move the entire directory tree and find that things will "just work." Is this the case? Do I need to do anything about line endings? ...
I am using git for windows to manage a local project. I have two branches, 'master' and 'change_specific'. I have added some extra files to 'change_specific'. Those files don't show up when I switch to 'master'. When I call git merge -m "don't need old branch" master change_specific git tells me "Already up-to-date. Yeeah!". Yet the ...
I'm seriously starting to think that I need to fork an open source project, for it to suit my own needs. I've sent patches to the original author, but the responses have been pretty terse and, well, unwelcoming. Anyhow. I've read the question Forking an open source project nicely, but this doesn't answer my more specific question: What...
I need an application to be able to fetch from a git repository but not push to it, so, that's the read-only part. That could easily be done with git daemon. On top of that, I need access to said repository to be password-protected, including for reading it. So before any fetching can happen, the application will need to authenticate. ...
I'm trying to set up Hudson as a CI Server and I'm having trouble getting everything to work. I'm trying to use the 'official' git plugin. I haven't done any testing with the alternate plugin developed by stephenh. I'm wondering if anyone else has gotten Hudson to work with Git or any CI server to work with Git. If so, how and with w...
I wan to place a VB.NET project under Git control in Windows (was previously under Visual Source Safe - long sad story of repository corruption, etc.). How should I set up the ignore file? The exclusions I'm thinking of using are: *.exe *.pdb *.manifest *.xml *.log (is Git case sensitive on Windows? Should I exclude *.l og as well?) *....
Which version control system should I use for a Rails app: Git or SVN? Here are some factors to consider: I'm the sole developer I'm familiar with SVN I've only used Git for a week, it seems pretty similar to SVN really. I want to put my repository on a remote location and connect to it via SSH or other protocol (which I already do wi...
I have a repository whose layout is like this: trunk/ projectA projectB branches/ projectA-1.0 projectB-1.0 tags/ projectA-1.0.1 projectB-1.0.1 I want to convert them to separate git repositories with the trunk/projectA as the top-level directory and all it's branches as git...
Hi there. I am looking for opinions of how to handle large binary files on which my source code (web application) is dependent. We are currently discussing several alternatives: Copy the binary files by hand. Pro: Not sure. Contra: I am strongly against this, as it increases the likelihood of errors when setting up a new site/migratin...
Hi! My company uses git internally and we publish some of our work as an open source on Google Code which uses svn. (Should it support git, the problem would be probably the same.) The problem is that we publish only part of our repository, so using git-svn as described on http://code.google.com/p/support/wiki/ImportingFromGit will not...
I'm evaluating various options for getting our team away from CVS. We have another large team on another site using Subversion, and some of our developers work with the Subversion server. Therefore, Subversion is an obvious choice for our team. However: Operations involving the Subversion server can be coffee-break slow (although we ha...
Do you have a clean way to list all the files that ever existed in specified branch? thanks ...
Hi, I just started using Git and I want to know if this is the right way of using it. I started a Rails app with: rails newapp Then I did: cd newapp git init git add . git commit -a So is it "right" to init my git inside my working directory? ...
For someone coming from a more conventional VCS background (CVS/SVN), what are the most compelling reasons to learn and migrate to git? Please comment upon a team's required technical ability in order to make git work. I've seen smart people climb the learning curve and still lose some hair over it. Can anyone climb this curve, or is ...