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.
| //EnhanceJS isIE test idea | |
| //detect IE and version number through injected conditional comments (no UA detect, no need for cond. compilation / jscript check) | |
| //version arg is for IE version (optional) | |
| //comparison arg supports 'lte', 'gte', etc (optional) | |
| function isIE(version, comparison) { | |
| var cc = 'IE', | |
| b = document.createElement('B'), |
| /*********************************************************************** | |
| * connect.c -- Make socket connection using SOCKS4/5 and HTTP tunnel. | |
| * | |
| * Copyright (c) 2000-2006 Shun-ichi Goto | |
| * Copyright (c) 2002, J. Grant (English Corrections) | |
| * Copyright (c) 2010, Reini Urban (added realm to http_auth basic) | |
| * | |
| * This program is free software; you can redistribute it and/or | |
| * modify it under the terms of the GNU General Public License | |
| * as published by the Free Software Foundation; either version 2 |
| #!/bin/bash | |
| if [ "$1" = "-h" -o "$1" = "--help" -o -z "$1" ]; then cat <<EOF | |
| appify v3.0.1 for Mac OS X - http://mths.be/appify | |
| Creates the simplest possible Mac app from a shell script. | |
| Appify takes a shell script as its first argument: | |
| `basename "$0"` my-script.sh |
Setup GitHub Pages "gh-pages" branch as a subfolder within the "master" project on your local checkout.
If you plan on switching between different branches (e.g. git checkout master-experiment
then revert back with git checkout master) you will loose your child folder from this tutorial (because it's in your
.gitignore and is not part of your master branch).
| #!/bin/sh | |
| # Just copy and paste the lines below (all at once, it won't work line by line!) | |
| # MAKE SURE YOU ARE HAPPY WITH WHAT IT DOES FIRST! THERE IS NO WARRANTY! | |
| function abort { | |
| echo "$1" | |
| exit 1 | |
| } | |
| set -e |
| <?PHP | |
| # JSONP "callback" param explanation, via basic PHP script. | |
| # | |
| # "Cowboy" Ben Alman | |
| # http://benalman.com/ | |
| # Set $data to something that will be serialized into JSON. You'll undoubtedly | |
| # have your own code for this. | |
| $data = array("some_key" => "some_value"); |
| #!/usr/bin/env python | |
| """ | |
| ignore_moves.py v0.2 | |
| Filter relocated lines from a unified diff format stream. | |
| Offered under the terms of the MIT License at github.com | |
| Taken from http://stackoverflow.com/questions/1380333/ | |
| """ | |
| import sys | |
| from optparse import OptionParser |
| Your name and email address were configured automatically based | |
| on your username and hostname. Please check that they are accurate. | |
| You can suppress this message by setting them explicitly: | |
| git config --global user.name "Your Name" | |
| git config --global user.email you@example.com | |
| After doing this, you may fix the identity used for this commit with: | |
| git commit --amend --reset-author |
| /* | |
| * Minimal classList shim for IE 9 | |
| * By Devon Govett | |
| * MIT LICENSE | |
| */ | |
| if (!("classList" in document.documentElement) && Object.defineProperty && typeof HTMLElement !== 'undefined') { | |
| Object.defineProperty(HTMLElement.prototype, 'classList', { | |
| get: function() { |
