Despite the name of this installer including “OS X” in its title, it supports OS versions 10.4.8 and later no matter what Cupertino’s current nom-du-jour for the OS happens to be – “Mac OS X”, “OS X”, “macOS” etc. Git Translations. The Git translations ARE included. For versions prior to 2.14.1, uninstall Git from your system and install a copy of the latest version from scratch. Check out our guide to installing Git on Windows for more details. For versions from 2.14.2 to 2.16.1, use the following command in your command prompt: git update. For versions 2.16.1 on, update Git with: git update-git-for-windows. On a Mac, it is important to remember to add.DSStore (a hidden OS X system file that's put in folders) to your.gitignore files. If you want to never include.DSStore files in your Git repositories, you can configure your Git to globally exclude those files. Used command line, git-tower and sourcetree. For basic things the command line is fine but I'm finding more and more I like the visual representation of what has changed offered in sourcetree and git-tower. Sourcetree seems to have a history of working great, getting an update and then performing really slow until another update.
Found an awesome GIT tip for OSX users which are having problems with case-sensitivity and renaming of files. The issue occurs when you use the default OS X disk format (case-preserving, but not case-sensitive) and try to rename a file or folder in git by changing letters to uppercase/lowercase.
A typical hack around the issue is to execute multiple commands:
gives no guarantee that it won't f*ck up any other users checkout which most likely need to remove the file or checkout a clean copy of the git repo.
However this approach caused me major headaches when I was doing a pull-request and had to squash my commits before pushing it (and one commit included the case changes to filenames). I did not find a good way to fix this problem. Also, other people in your team will not get the filename changes you just comitted on a
git pull. So, a new approach to the solution!
Enter the world of read-write disk image using Disk Utility and use this newly created volume as your base working directory for working with git-repos! If all OS X users in your oragnization/company uses this approach, you should be good!
Here's what you do:
- Launch Disk Utility
- Choose 'New Image'
- Enter a nice Name for your Volume, e.g 'Workspace'
- Set the size to something that will most likely fit your needs (resizing is a whole another story)
- Select 'Mac OS Extended (Case-sensitive, Journaled)' in 'Format'.
- Select 'Single Partition - Apple Partition Map' in 'Partitions'
- Ensure 'sparse bundle disk image' is set in 'Image Format'.
- Save it somewhere on your hard drive
Now, when you mount this disk image you can move all your git repos over to this Volume to enjoy a git that doesn't get confused by those pesky case-changes!
(PS: You can choose to add the Disk Image created to your Login Items in the OS X System Preferences to have it automatically mount on boot)
Git Extensions Os X
Update: My new favorite way of dealing with this is to buy a Nifty MiniDrive microSD card adapter that allows you to always have with you an extra harddrive without anything 'sticking out' of your macbook. With this option I always carry a extra 64 GB drive volume formatted as Mac OS Extended (Case-sensitive, Journaled) which I use for my git projects.