Miguel L Gonzalez miguelgonz

Quick fix ups

[alias]
  fixup = commit --amend -C HEAD

Automatically rebase the current stages changes into your last commit. For quick fixes when you don't want to create new commits, you can just do that instead of git rebase -i HEAD~2 and mark the last commit as fixup.

	<!DOCTYPE HTML>
	<html>
	<head>
	<meta http-equiv="content-type" content="text/html; charset=utf-8">
	<title>Find duplicates</title>
	<script type="text/javascript" charset="utf-8"></script>
	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
	<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.15.0/lodash.js"></script>
	<script type="text/javascript" src="duplicates.js">
	var els;

	version: '2'
	services:
	frontend:
	image: uncinimichel/unicorn-front:0.0.3
	ports:
	- "8080:8080"
	links:
	- backend
	environment:
	BACKEND_HOST: backend

	[core]
	excludesfile = /Users/gonzlm01/.gitignore_global
	editor = /usr/bin/vim

	[alias]
	b = branch
	ba = branch -a
	d = diff
	ci = commit
	co = checkout

	@unit
	@p1
	Scenario: Scenario: Programme information for each broadcast is present
	When there's an on-air channel there's a progress bar for it
	Then progress bar shows the correct progress for different on-air programmes

	#!/bin/sh
	#To make use of this just copy it to your path, +x it, and do git sync
	MAIN_BRANCH="develop"

	CURRENT_CHANGES=`git status --porcelain`
	CURRENT_BRANCH=`git symbolic-ref -q --short HEAD`

	if [ "$CURRENT_CHANGES" != "" ]; then
	git stash --include-untracked
	fi

	=== Machine on wifi , dev on IE8
	machine:
	wifi to iplayer_mobile
	-any turn proxies off
	unplug eth

	dev:
	proxies off and extacess on
	#reithproxies off
	#extaccess pal-ct