Skip to content

Instantly share code, notes, and snippets.

View scottnath's full-sized avatar

Scott Nath scottnath

View GitHub Profile
@tomysmile
tomysmile / mac-php-composer-setup.md
Created July 11, 2016 10:45
Setup PHP Composer using Brew
@zhiyelee
zhiyelee / .gitignore
Last active March 2, 2016 20:40
AVA_superTest
node_modules
@patik
patik / how-to-squash-commits-in-git.md
Last active October 17, 2023 02:19
How to squash commits in git

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:

@martinwolf
martinwolf / gulpfile.js
Created February 27, 2015 09:30
Jekyll, Browsersync and Gulp
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'),
@freshyill
freshyill / gulpfile.js
Last active May 30, 2018 23:15
Gulp-Pattern Lab Helper
//
// Paths
//
var basePaths = {
src: 'source/',
dest: 'source/'
};
var paths = {
anonymous
anonymous / gulpfile.js
Created May 5, 2014 19:21
gulp-webapp-generator + BrowserSync
'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')();
@seanbuscay
seanbuscay / git_create_orphan.sh
Created June 27, 2013 15:26
Create an orphan branch in a repo.
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