Luis de la Rosa » git

What to put in your gitignore

luis — Tue, 17 May 2011 04:22:55 +0000

A question that comes up frequently is what to put in your .gitignore files. I recently stumbled across a nice GitHub project which has .gitignore templates for every language it seems.

Here’s a few which are useful in my daily workflow:

iOS and Mac projects in Objective-C, using Xcode - This seems to cover both Xcode 3 and 4.

Android projects in Java and Eclipse

OS X (mainly for .DS_Store)

There’s also a nice explanation of how (project-specific) .gitignore and global .gitignore files work.

By the way, if you accidentally checked in a bunch of files you didn’t want to, use “git rm” to remove them from the repository.

GitX – a great Mac OS X tool for visualizing your Git history

luis — Wed, 17 Mar 2010 09:21:35 +0000

I’m a command-line kind of guy. I guess when your CS teachers in high school raised you on a Minicomputer with a dumb terminal and vi, you get used to that kind of thing.So I mostly use the git command line which is plenty fine for the usual git pull, git add, git commit, git push dance. (Hint: scripts are your friend) Creating branches and merging is decently good too on the command line.History is where it all falls down, though. Yes you can get the commit logs, but not the details so well. That is where a nice native Mac app like GitX comes into play. If you’ve used GitHub, it is similar to the history browser there. It also helps you visualize your branches and you can switch between them.You should definitely try out GitX if you’re using Git on Mac. Did I mention that it is free? Get it at http://gitx.frim.nl/

dim – visualize your Git diff in TextMate

luis — Thu, 15 Oct 2009 19:26:35 +0000

I use git as my primary version control system and one nice alias that I have in my ~/.bash_profile is “dim”. When I type in “dim”, I see my Git diff within TextMate which makes it easy to see what I’m about to commit.

Here’s the entire source:
alias dim="git diff | mate"

It should automatically pick the “Diff” language for you, but if not, then just pick it from the chooser at the bottom of the window to get the nice highlighting where deleted lines are in red, added lines are in green and markers are in blue.

Getting Sparkle from source (using bzr as compared with svn and git)

luis — Wed, 01 Jul 2009 17:29:27 +0000

A few notes about getting Sparkle, the widely used framework for updating Mac OS X apps, from source:

1. Get a branch. This is similar to “svn checkout” or “git clone”.
bzr branch lp:sparkle

I admit it is kind of cool to have such a short name here like “lp:sparkle” due to bzr’s integration with Launchpad, which is sort of like SourceForge or GitHub.

2. Later on, you might need to get the latest version. This is similar to “svn update” or “git pull”.
bzr pull

3. To make sure you have the latest, you can check what version you have. This is similar to “svn info”. The closest to this in git is “git log –max-count=1″
bzr version-info

You can compare that version to the latest one in the main Sparkle branch.