Watched Linus on Youtube talk about Git at Google dated a few years back, it was humorous and entertaining. I am finding more and more github projects and for me I think it's time for me to pick it all up. I am looking for recommendations for reading to get started with Git! I want to get up and running and hopefully contributing to s...
I am in the process of figuring out how to get Eclipse (Windows 7) working against our freshly git-migrated CVS repository which I have put in gitosis on an Ubuntu 10.04.1 LTS host. All software is installed with apt-get (git, gitosis, etc.). Eclipse with egit hangs when trying to check out, so I am playing with command line clients. ...
Debian stable has git 1.5.6.5 which is missing the --ff-only options in git pull/git merge. Is there a way to simulate this behavior with a series of alternative git commands? ...
Hi, I just converted a 10G CVS repo (about 120 modules) in one single git repo using cvs2git whithout any errors on a RHEL5 machine. I'd like to split one subdirectory+history off the repository and create a new one. (Like: http://stackoverflow.com/questions/811251/how-can-i-move-a-single-directory-from-a-git-repository-to-a-new-reposit...
EDIT: I'm using pico now for git messages, so I won't really need the solution anymore. But if you have suggestions, out of curiousity, I can try them. So I've got a git repository on cygwin, and doing 'git commit -a -m "message"' works just fine. However, doing 'git commit', which goes to an emacs window, and typing something in, and ...
I am tracking a remote repository, i.e. I have refs/remotes/joe/master. I know would like to get joe's changes as soon as possible into my repository. I don't want to use fetch, because I might not be at the computer when he commits. So I tell him: I might be out for shopping, so please just push your changes to refs/remotes/joe/master....
What's better to put on a web server? I'm new to Revision Control so I wouldn't know. Also this project exists already but I would like to implement some revision control on it and put it on a web server because there are multiple people that work on the code and multiple computers. Thanks! ...
I got hudson up and running. Installed git plugin. Created new job, typed in git repository URL, saved and hit 'build now'. It just freezes. When i cancel build, this is what I get: Started by user anonymous Checkout:workspace / C:\Users\taboo_user.TABOO.hudson\jobs\Interreg\workspace - hudson.remoting.LocalChannel@94aa42 Using ...
In the git documentation for the checkout command the following text is found: ...If no paths are given, git checkout will also update HEAD to set the specified branch as the current branch.... Can anyone give a simpler explanation of what this means? I'm sorry if it seems simple, and reading through that page, I can't seem t...
I'm working on a project that has basically 2 branches: master and "next-version". The two are constantly changed and the next-version needs to have the latest changes from master, but I can't just merge them both, because one version is published and the other one is still on alpha. I currently merge master to next-version everytime a...
I tried to get a former copy of my code by using the git checkout command. Before using this though, I committed the latest version of the code using git commit. After using git checkout to a previous version, I made changes to the code. Git now informs me that because I've made changes I can no longer revert to that most recent versi...
I'm following along with the railstutorial.org, and when I get to the "git push heroku master" part, I get the following error: fatal: Not a git repository (or any of the parent directories): .git So I do some googling, and see a common troubleshooting trick is to try "git remote -v". The problem is, whenever I try that, I get the sam...
I'm trying to git-svn to work on a private shadowcat svn server. git svn clone -s http://dev.catalystframework.org/repos/Catalyst/Catalyst-Plugin-ConfigLoader/ Initialized empty Git repository in /home/ecarroll/code/perl/foo/Catalyst-Plugin-ConfigLoader/.git/ Using higher level of URL: http://dev.catalystframework.org/repos/Catalyst/Cat...
Can patch files be read by TFS or visual studio? I'd like to either create a shelveset or apply the patch to a workspace in TFS. ...
I am trying to install gitorious on my personal server but I am not very familiar with Ruby or the frameworks and scripts involved in getting to the finish line. I am following the following instructions to install gitorious on my CentOS 5.4 server: http://www.tikalk.com/alm/blog/installing-gitorious-centos-55 The site comes up but a...
For example, I have a branch DEV and a branch STABLE. In case I have cherry-picked several commit from DEV to STABLE. Is there any way to let GIT aware of the cherry-picked commits, and avoid doubly-merging it if I later merge, rebase or cherry-pick an overlapped range, from DEV back to STABLE? (for which is a basic merge tracking feat...
Hi, I'm developing certain scripts and small software packages which I also package as debian packages. The code is maintained in git and I create new release tarballs with an make target and git-archive. This tarball is then fed to "uupdate -u .tar.gz" to update from the previous packaged version. This far everything works great and ...
I'm using two local repositories/working trees for our project development: one for the release version (bug-fixes only) and one for the continuing development in the master. Hence I don't need to switch between branches back and forth. We only merge changes from the release branch to the master, but not the opposite. Is it possib...
Hi, all questions I found want to avoid timeouts in git push/pull. In my case I want to force them. My push + pulls are all going over ssh to remote machines that might be unavailable at some point in time. For example, I have a script that pushes to two remote public repos. I don't want that this script hangs forever when it pushes to ...
I need to send email with diff after commit to the repository. I know how to send emails after push, but it is not working for commits. For pushes I've created hook post-receive that gets parameters . But the hook post-commit does not recieve any parameters and because of that I can't use my script that sends mail. Maybe there is a w...