skwpspace yan pritzker’s home on the web

Git rm pending files

If you’ve deleted a bunch of files in your directory, here’s a handy bash alias to git rm the changes into your index.

alias gitrm=”git stat | grep deleted | awk ‘{print $3}’ | xargs git rm”

Update: turns out git add -u takes care of deleted files.

GitHub is leading us to an opensource renaissance

Before GitHub, if you had something to contribute to an open source project, you basically had to worry about tracking your changes against someone else’s remote repo, which was usually svn or similar, which was difficult and cumbersome. And even if you did manage to have enough motivation to properly track, format, and email the [...]

Helpful shortcuts for git svn

Tired of having to stash your changes when you want to grab the latest from svn or want to dcommit one file while keeping others in your working tree?
In your bash profile:

alias svnpull=’git stash && git svn rebase && git stash apply’
alias svnpush=’git stash && git svn dcommit && git stash apply’

Git tips & tricks part 4: more on cherry picking

In my previous post I discussed how it was possible to merge individual changes from one branch to another. At that time I mentioned using the log on the original branch to figure out which changes were available to merge, but it turns out there’s an easier way.
Let’s say you made some changes in local-trunk [...]

Git tips and tricks part 3: working with svn branches and cherry-pick

After several weeks of git usage, I’ve developed a nice workflow. First, we’ll start with working with several svn branches via git.
Working with svn branches via git
Assuming you’ve properly cloned your svn repository, you should have your trunk and remote branches fetched from svn. You can see the remote branches via
git branch -r
If you [...]

More git tips and tricks

Here are a couple more fun git commands and configuration tricks.
Make some aliases because typing ‘checkout’ is a pain. In ~/.gitconfig:
Note the quicklog command below uses a custom log format which shows you a short hash, a relative date (”4 hours ago”) and the commit message. I created it by reading the git log formatting [...]

Useful git commands and quirks

Things I’ve learned from my first git experiences. First of all, git is inconsistent as hell. Every command has its own quirks and syntax, so I’m attempting to catalog some of them here. We’ve been using git svn at Planypus as a way to maintain local developer branches and still push to our svn as [...]

Rails moves to GitHub; Git is the new black

Rails has officially moved to GitHub. The GitHub guys have done an awesome job capitalizing on the growing trend of git usage, especially in the Rails community, and of course getting ‘official blessing’ from the Rails core team themselves means that many more projects are sure to follow.
I’ve been using git-svn to work on a [...]