Mark Haylock mhaylock

Locate the section for your github remote in the .git/config file. It looks like this:

[remote "origin"]
	fetch = +refs/heads/*:refs/remotes/origin/*
	url = [email protected]:joyent/node.git

Now add the line fetch = +refs/pull/*/head:refs/remotes/origin/pr/* to this section. Obviously, change the github url to match your project's URL. It ends up looking like this:

Download and install p4merge

Download the perforce visual tool suite from here: http://www.perforce.com/perforce/downloads/index.html
Copy only the p4merge.app file into your /Applications/ directory

Setup p4merge as a visual mergetool

Generate the list yourself:

$ cd /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS*.sdk/System/Library/Frameworks/UIKit.framework/Headers
$ grep UI_APPEARANCE_SELECTOR ./*     | \
  sed 's/NS_AVAILABLE_IOS(.*)//g'     | \
  sed 's/NS_DEPRECATED_IOS(.*)//g'    | \
  sed 's/API_AVAILABLE(.*)//g'        | \
  sed 's/API_UNAVAILABLE(.*)//g'      | \
 sed 's/UI_APPEARANCE_SELECTOR//g' | \

	#!/bin/sh

	###
	# SOME COMMANDS WILL NOT WORK ON macOS (Sierra or newer)
	# For Sierra or newer, see https://github.com/mathiasbynens/dotfiles/blob/master/.macos
	###

	# Alot of these configs have been taken from the various places
	# on the web, most from here
	# https://github.com/mathiasbynens/dotfiles/blob/5b3c8418ed42d93af2e647dc9d122f25cc034871/.osx

	// Created by Nick Snyder on 11/13/12.
	// https://gist.github.com/nicksnyder/4075682
	// http://stackoverflow.com/questions/12927027/uicollectionview-flowlayout-not-wrapping-cells-correctly-ios
	// NDCollectionViewFlowLayout.h
	@interface NDCollectionViewFlowLayout : UICollectionViewFlowLayout

	@end

	/* Imagine you want to develop a facebook canvas app.
	This snippet will do all the auth dance without requiring the user to click on login.
	But if the user is not logged in facebook, it will ask for the user to login.
	Tip: Open the browser console to see debug messages.
	Followed instructions of Facebook: https://developers.facebook.com/docs/howtos/login/getting-started/
	It's is possible to improve this code with more error handling.
	*/


	if (Meteor.is_client) {

	@implementation BHSCollectionViewFlowLayout

	- (NSArray *)layoutAttributesForElementsInRect:(CGRect)rect {
	NSArray *allAttrs = [super layoutAttributesForElementsInRect:rect];
	for (UICollectionViewLayoutAttributes *attributes in allAttrs) {
	attributes.frame = CGRectIntegral(attributes.frame);
	}
	return allAttrs;
	}

	#!/bin/bash

	git diff --cached -SNSLog --quiet

	if [ $? -eq 1 ]; then
	echo "NSLog call detected, indicating debug code is staged. Please unstage your debug code."
	exit 1
	fi

	exit 0

	#!/bin/bash
	# git-cleanup-repo
	#
	# Author: Rob Miller <[email protected]>
	# Adapted from the original by Yorick Sijsling

	git checkout master &> /dev/null

	# Make sure we're working with the most up-to-date version of master.
	git fetch