Baptiste Grenier gwarf

How to squash commits in a GitHub pull request

o you've contributed some code to an open source project, say, Rails. And they'd like you to squash all of the commits in your pull request. But you're not a git wizard; how do you make this happen?

Normally, you'd do something like this. I'm assuming upstream is a git remote that is pointing at the official project repository, and that your changes are in your 'omgpull' branch:

Setup Mac OS X

Homebrew

Install additional tools usikng homebrew.

Install Homebrew

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

Keybase proof

I hereby claim:

I am gwarf on github.
I am gwarf (https://keybase.io/gwarf) on keybase.
I have a public key ASDP0gIMQIMA6rzuaS5XaCyP2rE2L3ODxUNRzsA34pI5CQo

To claim this, I am signing this object:

Using Terraform on MacOS X to manage KVM-backed VMs

Installing

Terraform

brew install terraform

SSH Forwarding on MacOS X

Forwarding SSH agent

Configure ~/.ssh/config

# Allow Agent forwarding for a specific host (by security)
Host remotehost
  ForwardAgent yes

	" cvim configuration

	" Use local configuration
	let configpath = "/home/baptiste/.cvimrc"
	set localconfig
	let homedirectory = "/home/baptiste"

	" Hint configuration
	let hintcharacters = "asdfghjkl;"
	set nodimhintcharacters

	// https://brookhong.github.io/2015/09/15/surfingkeys.html
	// version 2.0

	// align then hint to the right
	settings.hintAlign = "left";

	// hint characters
	Hints.characters = "asdfghjkl;";

	// intercept all error pages so Surfing keys can work on them

	# Copyright 2014-2015 Joe Block <[email protected]>
	#
	# Licensed under the Apache License, Version 2.0 (the "License");
	# you may not use this file except in compliance with the License.
	# You may obtain a copy of the License at
	#
	# http://www.apache.org/licenses/LICENSE-2.0
	#
	# Unless required by applicable law or agreed to in writing, software
	# distributed under the License is distributed on an "AS IS" BASIS,

	site:
	# Your site name, as in GODCB (if omitted or set to None, this value is
	# retreived from /etc/glite-info-static/site/site.cfg )
	name: SITE_NAME

	compute:
	# Total number of cores available
	total_cores: 42
	# Total RAM available (GB)
	total_ram: 42

	# CentOS 6 with Gnome desktop

	```console
	sudo yum groupinstall -y "GNOME Desktop"
	sudo systemctl set-default graphical.target
	```

	When running in VirtualBox, if not able to see mouse cursor:

	Launch VirtualBox --> Oracle VM VirtualBox Manager --> Select VM --> Settings --> Display --> Graphics Controller --> VBoxSVGA