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.
| #!/usr/bin/env bash | |
| # | |
| # url : https://gist.github.com/672684 | |
| # version : 2.0.2 | |
| # name : appify | |
| # description : Create the simplest possible mac app from a shell script. | |
| # usage : cat my-script.sh | appify MyApp | |
| # platform : Mac OS X | |
| # author : Thomas Aylott <oblivious@subtlegradient.com> |
Links and Notes from my Classy Git RubyConf talk:
| require 'formula' | |
| class Vim < Formula | |
| homepage 'http://www.vim.org/' | |
| url 'ftp://ftp.vim.org/pub/vim/unix/vim-7.3.tar.bz2' | |
| head 'https://vim.googlecode.com/hg/' | |
| sha256 '5c5d5d6e07f1bbc49b6fe3906ff8a7e39b049928b68195b38e3e3d347100221d' | |
| version '7.3.682' | |
| def features; %w(tiny small normal big huge) end |
| -- See article here: http://daringfireball.net/2007/07/simple_inbox_sweeper | |
| -- The following should be one long line: | |
| set _description to "All unflagged, read messages in each IMAP account | |
| inbox will be moved to the “Archive” mailbox corresponding to that | |
| account. This action is not undoable." | |
| tell application "Mail" | |
| display alert "Archive read messages from IMAP inboxes?" buttons ¬ | |
| {"Cancel", "Archive"} cancel button 1 message _description |
| # Ruby 1.9 Fast require: | |
| # https://gist.github.com/1008945 | |
| curl https://raw.github.com/gist/1008945/7532898172cd9f03b4c0d0db145bc2440dcbb2f6/load.patch > load.patch | |
| # Ruby 1.9.2 GC Patch: | |
| # https://gist.github.com/856296 | |
| curl https://raw.github.com/gist/856296/a19ac26fe7412ef398bd9f57e61f06fef1f186fe/patch-1.9.2-gc.patch > gc.patch | |
| rvm install 1.9.2-p180 --patch load.patch,gc.patch -n loadgc | |
| rm gc.patch load.patch |
| alias server='open http://localhost:8000 && python -m SimpleHTTPServer' |
| ENV["RAILS_ENV"] = "test" | |
| require File.expand_path('../../config/environment', __FILE__) | |
| require 'rails/test_help' | |
| require 'minitest/autorun' | |
| require 'minitest/pride' | |
| require 'capybara/rails' | |
| class MiniTest::Spec | |
| include ActiveSupport::Testing::SetupAndTeardown |
| #!/usr/bin/env ruby | |
| # giftube – Generates an animated gif from a YouTube url. | |
| # | |
| # Usage: | |
| # | |
| # giftube [youtube url] [minute:second] [duration] | |
| # | |
| # ex. | |
| # |
| 2139 ℹ INFORMATION SOURCE | |
| 23EB ⏫ BLACK UP-POINTING DOUBLE TRIANGLE | |
| 23EC ⏬ BLACK DOWN-POINTING DOUBLE TRIANGLE | |
| 23F0 ⏰ ALARM CLOCK | |
| 23F3 ⏳ HOURGLASS WITH FLOWING SAND | |
| 26C5 ⛅ SUN BEHIND CLOUD | |
| 26D4 ⛔ NO ENTRY | |
| 2705 ✅ WHITE HEAVY CHECK MARK | |
| 2753 ❓ BLACK QUESTION MARK ORNAMENT | |
| 2757 ❗ HEAVY EXCLAMATION MARK SYMBOL |
