Skip to content

Instantly share code, notes, and snippets.

View gwarnes-mdsol's full-sized avatar

Gregory R. Warnes gwarnes-mdsol

6 followers · 2 following
View GitHub Profile
@gwarnes-mdsol
gwarnes-mdsol / gdiff
Last active March 16, 2021 04:43 — forked from miner/gdiff
Use FileMerge as git difftool on Mac OS X
#!/bin/bash
#
# A git difftool for Mac OS X that uses FileMerge from XCode
#
# source: https://gist.github.com/gwarnes-mdsol/b0aff96fbb7a4c92e570e7b03daa7e1b
#
# Setup:
#
# 1. Copy this file to a known path, e.g. $HOME/bin/gdiff
# 2. Make the file executable:
@gwarnes-mdsol
gwarnes-mdsol / howto-filemerge-git-osx.md
Created November 3, 2016 20:59 — forked from bkeating/howto-filemerge-git-osx.md
HOWTO: Using FileMerge (opendiff) with Git on OSX

HOWTO: Using FileMerge (opendiff) with Git on OSX

FileMerge (opendiff) can really come in handy when you need to visually compare merging conflicts. Other times it's just a nice visual way to review your days work.

The following method works by creating a simple bash script (git-diff-cmd.sh) that sets us up with the proper command line arguments for Git to pass off files to FileMerge.