Cameron Ehrlich cameronehrlich

Squashing your commits into one commit without using interactive rebase (https://github.com/edx/edx-platform/wiki/How-to-Rebase-a-Pull-Request#squash-your-changes)

This basically takes the diff of your branch + origin/master and sets them aside for you to "recommit" them.

git fetch -ap # get in sync w/ server
git checkout jscs-disallow-redundant-spaces # switch to the appropriate branch
git reset --hard origin/jscs-disallow-redundant-spaces # get my branch to be exactly the same as what's on the server
MERGE_BASE=$(git merge-base origin/jscs-disallow-redundant-spaces origin/master) # get the commit where your branch originates
git reset --mixed $MERGE_BASE # reset to the point where your branch originates, but put your changes like you just made them

	#import "UICollectionViewFlowLayoutCenterItem.h"

	@implementation UICollectionViewFlowLayoutCenterItem

	- (CGPoint)targetContentOffsetForProposedContentOffset:(CGPoint)proposedContentOffset withScrollingVelocity:(CGPoint)velocity
	{
	CGSize collectionViewSize = self.collectionView.bounds.size;
	CGFloat proposedContentOffsetCenterX = proposedContentOffset.x + self.collectionView.bounds.size.width * 0.5f;

	CGRect proposedRect = self.collectionView.bounds;

	@interface PLViewController ()

	@property (strong, nonatomic) IBOutlet UIWebView *webView;

	@end

	@implementation PLViewController

	- (void)viewDidLoad
	{

	-(UIImage*)mmg_imageScaledToFitSize:(CGSize)fitSize
	{
	// Create a vImage_Buffer from the CGImage
	CGImageRef sourceRef = self.CGImage;
	vImage_Buffer srcBuffer;
	vImage_CGImageFormat format = {
	.bitsPerComponent = 8,
	.bitsPerPixel = 32,
	.colorSpace = NULL,
	.bitmapInfo = (CGBitmapInfo)kCGImageAlphaFirst,

	var states = ["Alabama",
	"Alaska",
	"Arizona",
	"Arkansas",
	"California",
	"Colorado",
	"Connecticut",
	"Delaware",
	"Florida",
	"Georgia",

	wget http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.29_mac.pkg
	sudo installer -pkg cuda_7.0.29_mac.pkg -target /
	// once cpp-ethereum 0.9.23 is released on homebrew you do not need to build from source
	brew update
	brew tap ethereum/ethereum
	brew reinstall cpp-ethereum --with-gpu-mining --devel --build-from-source
	// or build from source:
	// cd cpp-ethereum
	// cmake -DETHASHCL=1 -DGUI=0
	// make -j8

	//
	// PasteboardWatcher.swift
	// PasteboardWatcher
	//
	// Created by Devarshi Kulshreshtha on 6/19/15.PasteboardWatcher
	// Copyright © 2015 Devarshi Kulshreshtha. All rights reserved.
	//

	import Cocoa

	## Make sure your local repo settings are correct
	git config --local --list
	git config --local user.name "author name"
	git config --local user.email "name@example.com"

	## Change previous n commits
	git rebase -i HEAD~n
	# choose the commits to change by adding 'pick' or 'reword' (only for changing the message)
	git commit --amend --author="Author Name <email@address.com>"
	# change first commit in repo

	import UIKit

	extension UIImage {
	subscript (x: Int, y: Int) -> UIColor? {
	guard x >= 0 && x < Int(size.width) && y >= 0 && y < Int(size.height),
	let cgImage = cgImage,
	let provider = cgImage.dataProvider,
	let providerData = provider.data,
	let data = CFDataGetBytePtr(providerData) else {
	return nil

	class DefaultsManager {
	enum Key : String {
	case
	AuthToken = "AuthToken",
	AuthTokenTimestamp = "AuthTokenTimestamp"
	}

	class var sharedInstance : DefaultsManager {
	struct Static {
	static let instance : DefaultsManager = DefaultsManager()