Scott Nath scottnath

Firstly install Brew on your MAC

ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"

Then install PHP

brew update
brew tap homebrew/dupes
brew tap homebrew/php
brew install php56

Squashing Git Commits

The easy and flexible way

This method avoids merge conflicts if you have periodically pulled master into your branch. It also gives you the opportunity to squash into more than 1 commit, or to re-arrange your code into completely different commits (e.g. if you ended up working on three different features but the commits were not consecutive).

Note: You cannot use this method if you intend to open a pull request to merge your feature branch. This method requires committing directly to master.

Switch to the master branch and make sure you are up to date:

	var gulp = require('gulp'),
	sass = require('gulp-ruby-sass'),
	autoprefixer = require('gulp-autoprefixer'),
	minifycss = require('gulp-minify-css'),
	jshint = require('gulp-jshint'),
	uglify = require('gulp-uglify'),
	rename = require('gulp-rename'),
	clean = require('gulp-clean'),
	concat = require('gulp-concat'),
	notify = require('gulp-notify'),

	//
	// Paths
	//

	var basePaths = {
	src: 'source/',
	dest: 'source/'
	};

	var paths = {

	'use strict';
	// generated on 2014-05-05 using generator-gulp-webapp 0.1.0

	var gulp = require('gulp');
	var browserSync = require('browser-sync');
	var reload = browserSync.reload;

	// load plugins
	var $ = require('gulp-load-plugins')();

	cd repository
	git checkout --orphan orphan_name
	git rm -rf .
	rm '.gitignore'
	echo "#Title of Readme" > README.md
	git add README.md
	git commit -a -m "Initial Commit"
	git push origin orphan_name