git

Setting the right group rights on a git remote repo

Hi there, I've got a git remote repo at my server. Everytime I push my local branch to the server the files in ~/objects have just the rw permissions for my specific account(not my group – git). So when my friend does a push concerning those files in ~/objects hes getting a rights-permission error. Hes in the same group: git, but of cou...

git push fatal failed

I somehow deleted the whole directory of my code branch. I cloned a new one. It worked fine except pushing. ~/workspace/wtf (mybranch)]$ git push origin mybranch error: Cannot access URL [my url], return code 22 fatal: git-http-push failed git pull works, though. How can I fix it? ...

Should I keep my version control (git) separate from project?

Hey all, I was wondering how people deal with the fact that a git repo is really large and when I push the project to the web, copying the repo takes by far the majority of the time. Thanks, Matt ...

Capistrano + NGINX Passenger Restart Rails App

Hey Guys. I've finally gotten capistrano to work on my website, however, I cannot seem to get the restart part of the application to work. What I want todo is setup capistrano to restart the mongrel cluster that is running the rails app after a deploy has gone through. Since I used passenger to install everything, I have no clue how to ...

How do I import a new release of a project into my git repository?

My repository looks like this. v1 - A - B - C ... where the commit v1 represents the contents of upstream-project-foo-0.9.8.tar.gz and the commits A, B ... are my modifications. The goal is to upgrade my copy of upstream-project and port the commits A, B, C ... to it. How do I get a new version of the upstream-project tarball into m...

Committing to two remote projects from Git.

I have a project in Codeigniter, managed via Git and Github, that consists of my 'boilerplate' customizations and libraries (like a centralized Render library) that I use for all of my CI projects - let's call that 'Baseline'. At the same time that I'm developing and refining the Baseline CI project, I'm also developing the current cl...

git, Force overwrite of local file with what's it origin repo?

I want to get the latest file that's in the repo, and overwrite what I have locally. how can I do this with git? ...

How to configure emacs.app to use git within *shell* for git on OSX

I'm using emacs.app 23.1.1 on OsX and trying to use git within a shell. When I use a command like git log-p, I get WARNING: terminal is not fully functional - (press RETURN) I also get something similar with git commit and I'm forced to use git commit -m. How can I configure emacs.app so this works within its shell? ...

capistrano failing to clone git submodules on http

I have a web project set to deploy from a git repo. If I set up the project with http submodules (e.g. http://github....etc) it fails to deploy, with: ** [my-dev-server.com :: out] Synced lib/vendor/odm ** [my-dev-server.com :: out] Cloning into lib/vendor/odm... ** [my-dev-server.com :: err] fatal: Unable to find remote helper for 'ht...

"git branch --track" vs "git checkout --track"

What is the difference between "git branch --track" and "git checkout -b --track", if there is any? ...

Mercurial or Git

Hello I need a good SCM with integration in Visual Studio 2010 and ability to work over internet, I mean other users should be able to checkin/checkout files through internet/network. I saw Git and its Extensions but I had problem with VS Integration. Its toolbar buttons and menu items didn't respond to my clicks, it just did nothing. I ...

What's the best way to have a "temporary" commit in git?

Say I have a project with two branches master and dev. I have a bunch of commits on dev for a special event which once tested are merged into master. Then after the event is over I want to remove the event specific code. However a git reset won't do since other commits have been made since the event code was added. Currently I use git c...

Old files are missing after git-svn clone with revision range control

Hi there, I'm trying to clone mplayer repository with git. Since there is too many revisions, I cloned with git svn clone svn://svn.mplayerhq.hu/mplayer/trunk -r32000:HEAD mplayer-git After the cloning, there're 3 folders missing including ffmpeg, libdvdnav, libdvdread4, all of which are commited in very old revisions and has not be...

Building a minimal clone of Git as an undergrad final year project

Hi, I was reading the book Git Internals and was awestruck by its simplicity. So I thought may be I could try to make a simplistic version of Git (something that can be done withing 4-5 months time period). I understand that Git is a huge project and done by the best of the software engineers. My question is what are the possible ch...

How to complete a git clone for a big project on an unstable connection?

I am trying to git clone the LibreOffice codebase, but at the moment I have an internet connection by mobile phone and it's just anything but stable. I can get the connection back any moment, but then the git clone process already stopped working, and no way to get it running again. Is there some way to have a more failure-resistant git ...

Setting up a git repository on a openSuse VPS

I just got hold of an openSuse 10.3 VPS. I really don't know much about Unix and SSH and this stuff but I'd like to use my server to host a GIT repository. This seems simple enough to me... Here is what I did: I SSHed into my server and installed GIT (I guess), simply by entering # yast --install git Then some magic happened and obv...

Having problems with .gitignore and Untracked files

Greetings, I have a weird problem with Git and using .gitignore. I have a folder (that has contents) in my structure that is currently not getting tracked by git because it shows up under the Untracked files when I do git status. I add it's path to .gitignore but try git status again and it is still there! Other files/folders, I do t...

DVCS working on remote server

My workplace is considering moving to a modern (D)VCS which is something that I am pushing for. My boss is in on the idea and the current workflow would be to have a centralized repository where everyone can commit/merge their changes when a task is done, While working on a task each developer can have their own branch to work on and co...

Is there a way to tell git to stop tracking files before a certain commit?

I have a git repo that has about 3 or 4 months worth of code. Is there a way to tell git to stop tracking files before a certain commit? ...

Mac specific optimizations in ~/.gitconfig

I read that discussion about the content of "~/.gitconfig" on Linux: http://stackoverflow.com/questions/267761/what-does-your-gitconfig-contain I know some Mac specific optimizations, such as using "mate" as default editor: [core] editor = mate -w or using opendiff as diff editor: [diff] external = opendiff Do you know oth...