Skip to content

Instantly share code, notes, and snippets.

View mereformalities's full-sized avatar

Brant Watrous mereformalities

View GitHub Profile
@mereformalities
mereformalities / .gitignore
Last active October 6, 2015 03:18
Xcode 4, 5 .gitignore
MANIFEST
Pods/
build/
dist/
.svn
.DS_Store
.ruby-*
*.swp
*.o
*.pyc
@mereformalities
mereformalities / .gitignore
Created June 13, 2012 23:43
Ruby Gem .gitignore
*.gem
*.rbc
*.sassc
.bundle
.config
.yardoc
.rvmrc
.rspec
.sass-cache
.DS_Store

Running git push -u origin master asks for my password after cloning a repo

Either:

  • Clone the repo using the format git@github.com:username/repo.git
  • Run mate .git/config and change the origin url to the git@github.com format

Using FileMerge (opendiff) with Git on Mountain Lion

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.

@mereformalities
mereformalities / gulpfile.js
Created March 4, 2014 19:52
WordPress Gulpfile
'use strict';
// Include gulp
var gulp = require('gulp');
var _ = require('lodash');
// Include our plugins
var gutil = require('gulp-util');
var flatten = require('gulp-flatten');
var modernizr = require('gulp-modernizr');
@mereformalities
mereformalities / .bash_profile
Last active February 21, 2017 21:28
Example Bash Profile
# alias e=mate
# VISUAL="mate -w"
# export VISUAL
# export EDITOR='subl --new-window --wait'
# export VISUAL='subl --new-window --wait'
# alias e='subl --new-window'
# export EDITOR='vim'
# export VISUAL='vim'
@mereformalities
mereformalities / BeautifyRuby.sublime-settings
Last active August 29, 2015 14:17
Sublime Text Settings
{
"ruby": "~/.rvm/bin/rvm-auto-ruby",
"save_on_beautify": false,
"tab_size": 2,
"translate_tabs_to_spaces": true
}