git

Setting Environment for Testing and Production

I'm developing a system in CakePHP, using Git as the version control system. I have a working copy in my testing server and another in my production server, both with different databases. Everytime I make changes, I have to change the database configuration so I can test the system. Is there another way to keep two files, with different ...

Make .gitignore ignore everything except a few files

I understand that a .gitignore file cloaks specified files from Git's version control. I have a project (LaTeX) that generates lots of extra files (.auth, .dvi, .pdf, logs, etc) as it runs, but I don't want those to be tracked. I'm aware that I could (maybe should) make it so all those files are put in an separate subfolder in the proj...

Git Ignores and Maven targets

Anyone know if it is possible to ignore all the instances of a particular directory in a file structure managed by git. I'm looking to exclude all the 'target' folders in a maven project with a number of submodules. I know I can explicitly exclude each of them in a top level .gitignore, but I'd really like to be able to specify a patte...

git submodules: ln -s

How can I create a directory link that will survive git submodule update? Given the following example directory structure: proj |-- lib3 | `-- submod | `-- lib `-- lib I created a soft link from proj/lib/ to proj/lib3/submod/lib using something like the following command: brad@bradpc:~/proj/lib$ ln -s ../lib3/submod/lib subm...

Popularity of Git/Mercurial/Bazaar vs. which to recommend

Going by the number of questions on this site for these three distributed version control systems, it seems like Git either is more popular, or is more difficult (hence requiring more questions), or has more features (hence requiring more questions). Or most probably a combination of the three. (Let's say that popularity on this s...

Is anyone really using git super/subprojects?

Is anyone using the new git super/subproject feature in real projects? How well does it work? For instance, I understand that if I push to a subproject I have to manually call superprojects hooks (maybe using the subprojects hook, but nevertheless)? ...

Looking for Windows Text Editor which supports GIT

Hello all, I am looking for a Text Editor on Windows which is integrated with GIT (check out, check in from the UI). Also, it would be nice is this editor could also support Python syntax highlighting. Is there anything like that available? Thanks! ...

How to keep public and private versions of a git repo in sync?

I'm releasing an open-source Rails app on Github (probably MIT license). I also want to maintain a private branch/fork of the project that we will use as part of a pay service. What is the best way to organize the repo(s) in this scenario? And, how can I keep the projects in sync when I have updates that should go to both? ...

Why is this git clone command failing?

Trying to use the git clone command. My understanding (please correct if wrong) was that in order to host a Git repository you just need a machine running ssh and the project/repository sitting on it in a permitted location. I have my git repository on an OS X system that's running ssh. I'm trying to clone it on a Windows XP system. I h...

Expected FS format '2' found format '3 git-svn

I was just checking out git-svn and thought I would give it a try with one of my existing repository. When I ran git-svn I got this error. Couldn't open a repository: Unable to open an ra_local session to URL: Unable to open repository '{MyFilePath}': Expected FS format '2'; found format '3' at C:/Program Files/Git/bin/git-svn line 13...

Is Git recommended for large (>250GB) content repositories

The web-application is a custom-built CMS which has several sub-applications and each one of them has code and content residing in the same directory structure. Due to the application framework's architecture the code and content are intertwined (content depends upon the code for its display and other functionalities) and hence are insep...

git push says everything up-to-date even though I have local changes

I have a remote gitosis server and a local git repository, and each time I make a big change in my code, I'll push the changes to that server too. But today I find that even though I have some local changes and commit to local repository, when running git push origin master it says 'Everything up-to-date', but when I use git clone to c...

Emacs custom building from git

I have cloned the emacs git repo. What i am trying to do is modify it so that site-list.el contains a line of code telling emacs to load my custom emacs lib on load. But i would like to do it in a branch so that i can keep up with the bug fixes but every time i build it it gets build with my custom site-lisp file. But i can not seem to ...

Setting up a git repo on my GoDaddy hosting plan

I have a project which is version-controlled using git. What I want to be able to do is set up a repo on my (ssh-enabled) GoDaddy shared hosting package so that I can deploy with a push rather than dragging and dropping in FTP. Any tips would be appreciated. Best would be an account from someone who's already done it, but I couldn't pe...

How to use Git?

I am an engineering student who spends most of his spare time watching TV rather than coding. So basically I have zero experience with any kind of version control system. My understanding is somehow they make distribution of projects easier. I was looking into Blueprint CSS Framework, liked it and downloaded from their Git project page....

password problem with git clone gitosis@host:gitosis-admin.git

Hi, all I'm confronted with some problems when trying to configure gitosis on Ubuntu. When i run this command git clone gitosis@host:gitosis-admin.git For my local machine i used git clone [email protected]:gitosis-admin.git where 59.80.70.68 is the ip of the server. But I get a password problem. I tried entering password of the server...

problem using GIT and emacs eshell mode on Windows

when i try to make a git commit in emacs eshell mode: git commit -a -m "message" I receive an error: 'c:\Program' is not recognized as an internal or external command, operable program or batch file. and at the same time this problem is absent in emacs shell mode. How to force eshell work correctly with git? ...

git: how to reference the initial commit?

I've got a script that needs to reference the initial commit in a repository. git has the special reference HEAD, but doesn't have the corresponding TAIL. I cannot find anything in git help rev-parse that would seem to help me. Here's what I'd like to do: git show TAIL Here's one option I have: git show `git log --reverse | if re...

Monitoring and bisecting changes of output of some commands ran on a source code repository

I'd like to know if there is some tool to monitor changes that a patch does to a project. I have a source code repository, and I'd like to do things like: see what a patch changes in (text) output of an arbitrary program, eg. compiler output, or testsuite output etc. when applied given a line in some of these outputs, I'd like to bise...

Is it easier to manage code with GIT or Bazaar?

I'm researching the GIT and Bazaar capabilities and wonder which one has more feature-rich code management? Here you can find the location for both source control engines: GIT Bazaar ...