Git 1.6.6 and Xcode 3.2.x

July 12th, 2010

I like to use git as my primary source code version control. Git commands are simple to use and git’s method of branching, commits, tags are easy to understand and use. However, Xcode supports only svn within the IDE. Git can still be used with Xcode but a .gitignore file and .gitattributes file should be created.

The .gitignore File

In Xcode 3.2.x the *.xcodeproj folder contains project files specific to Xcode. I usually specify to git that the xcodeproj folder should be ignored, except for the pbxproj file within the folder.

#
# .gitignore file
#
# Ignore any build files and older project files
build/*
*.mode1v3
*.mode2v3
*.pbxuser
*.perspective 
*.perspectivev3

# Ignore the xcodeproj
*.xcodeproj

# Don't ignore the pbxproj within the xcodeproj folder
!*.xcodeproj/project.pbxproj

# Ignore .svn information
.svn

# Ignore OSX-specific files
.DS_Store
profile

The .gitattributes File

I usually specify to git that it should not convert, diff, or merge the *.pbxproj file.

#
#
# .gitattributes file
#
# Effectively treat the pbxproj as binary
#
*.pbxproj -crlf -diff -merge

Links

For more info about gitignore

For more info about gitattributes

If you maintain various virtual domains on a Debian Lenny box you can use Apple’s mail.app to access each virtual domain so you can send/receive e-mail as different users on those virtual domains. I use mail.app to access many virtual domains, on a daily basis and it works pretty well. This short article, describes how to set up the server correctly.

Install Courier with IMAP and IMAP SSL. If you want to be somewhat secure, only install the courier-imap-ssl. When you are prompted if you want to set up the web configuration directories, select NO.

apt-get install courier-imap courier-imap-ssl

If you are running mailx, you’ll need to install the mailbox conversion program

apt-get install  mb2md

Create the Courier mail directory, using maildirmake

su - myuser
cd /home/myuser
maildirmake Maildir

Convert the contents of the current mbox to the Maildir

su - myuser
mb2md -s /home/myuser/mbox -d /home/myuser/Maildir

For future incoming e-mail, let the email go into mbox, but put a copy into Maildir, create a .procmailrc with the following:

MAILDIR=$HOME/Maildir
:0c 
$MAILDIR/