Git-ing a branch from GitHub

I want to clone this edge branch of a github repo. The following command is identically listed in the readme for both master and edge git clone –depth 1 git://github.com/bborn/communityengine.git vendor/plugins/community_engine How do I specify to git that I want the edge branch?

Git rebase failing

I’m trying to rebase the work of a colleague. First, I get a ton of conflicts where <<<<< head seams to contain the new code. Then after a while I get the following error: fatal: update_ref failed for ref ‘refs/heads/dev_504’: cannot lock ref ‘refs/heads/dev_504’: ref refs/heads/dev_504 is at XXXXXXX but expected XXXXXXXX Could not move […]

Git: Rename or move all files at once

I want to rename all erb files in my Git project to haml.(like index.html.erb to index.html.haml) If I rename each file, I have to type the following command more than thirty times. $ git mv app/views/pages/index.html.erb app/views/pages/index.html.haml I tried the command below, but it did not work. $ git mv app/views/**/*.erb app/views/**/*.haml usage: git mv […]

Fixing up a git repo that is slowed because of big binary files

We have a git repo containing both source code and binaries. The bare repo has now reached ~9GB, and cloning it takes ages. Most of the time is spent in “remote: Compressing objects”. After a commit with a new version of one of the bigger binaries, a fetch takes a long time, also spent compressing […]

Git push vs. git push heroku master

I just moved from a pc laptop to a Mac, and I’ve noticed a curious difference in how my git commands respond. Before, I would do the following: git add . git commit -m “These are my new changes” git push # This would update my repo on github {enter password} git push heroku master […]

Cygwin git fork() error on pull

The basic problem is that sometimes when I do git pull upstream master I get remote: Counting objects: 172, done. remote: Compressing objects: 100% (57/57), done. remote: Total 119 (delta 45), reused 95 (delta 21) 0 [main] git 8660 fork: child -1 – forked process 4520 died unexpectedly, retry 0, exit code -1073741515, errno 11 […]

How do I read tagger information from a git tag?

So far I have: git rev-parse <tagname> | xargs git cat-file -p but this isn’t the easiest thing to parse. I was hoping for something similar to git-log‘s –pretty option so I could grab just the info I need. Any ideas? Thanks

How do you squelch git's automatic merge message?

I’m trying to do some automation scripts using git, simple things like updating submodules, moving to proper tags etc, but one of the problems I’m now finding is that git now forces you to confirm a merge message. Is there any way to squelch this behavior from happening?

git “revert” current directory

In svn it’s possible to do svn revert ./* in which the current directory and ONLY the current directory gets reverted. What is the git equivalent to svn revert in which only the current directory gets reverted? I know that there’s git reset –hard, but it reverts everything and not just the current directory. How […]

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 […]

Git Baby is a git and github fan, let's start git clone.