Jonas Heinrich onny

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:

README

Create a template service file at /etc/systemd/system/[email protected]. The template parameter will correspond to the name of target host:

[Unit]
Description=Setup a secure tunnel to %I
After=network.target

Intel Edison OTA w/ SD Card

This Gist attempts to document the research and (hopefully) steps to successfully allowing U-Boot to perform an OTA (over-the-air) update.

Please comment with corrections and suggestions!

Performing an OTA Update: Place the contents of the toFlash directory onto the update partition of the Intel Edison. Then, at the U-Boot prompt run do_ota. Or, if the system is running in multi-user mode, run as root: reboot ota.

Motivation: Currently (Yocto 2.1, Intel Edison) has an update partition of ~800MB. The Yocto toFlash directory is ~500MB, so placing it on to the update partition is no problem, allowing an OTA update through U-Boot. However, to do an OTA update using Emutex Labs' Ubilinxu is currently impossible as the Ubilinux toFlash directory is ~1.6GB.


	class custom_sub_walker extends Walker_Nav_Menu {

	public function start_lvl( &$output, $depth = 0, $args = array() ) {
	$indent = str_repeat( "\t", $depth );
	$output .= "\n$indent<ul role=\"menu\" class=\" dropdown-menu\">\n";
	}

	public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
	$indent = ( $depth ) ? str_repeat( "\t", $depth ) : '';

	# Install ARCH Linux with encrypted file-system and UEFI
	# The official installation guide (https://wiki.archlinux.org/index.php/Installation_Guide) contains a more verbose description.

	# Download the archiso image from https://www.archlinux.org/
	# Copy to a usb-drive
	dd if=archlinux.img of=/dev/sdX bs=16M && sync # on linux

	# Boot from the usb. If the usb fails to boot, make sure that secure boot is disabled in the BIOS configuration.

	# Set swiss-french keymap

	# /etc/systemd/system/docker.service.d/docker-nftables.conf
	# disable iptables in docker, allowing nftables to do work
	[Service]
	ExecStart=
	ExecStart=/usr/bin/docker daemon -H fd:// --iptables=false

	#!/bin/bash
	#
	# Created by Felipe Machado - 2016/02/14
	#
	# A retry command for bash
	# Retries the given command up to MAX_RETRIES, with an interval of SLEEP_TIME
	# between each retry. Just put it on your bash_profile and be happy :)
	# Usage:
	# retry [-s SLEEP_TIME] [-m MAX_RETRIES] COMMAND_WITH_ARGUMENTS
	#

	<!DOCTYPE html>
	<html>
	<head>
	<meta charset='utf-8' />
	<title></title>
	<meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no' />
	<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.2/mapbox-gl.js'></script>
	<link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.12.2/mapbox-gl.css' rel='stylesheet' />
	<style>
	body { margin:0; padding:0; }

	upstream php-fpm {
	# Path to PHP-FPM socket
	server unix:/var/run/php-fpm/php-fpm.sock;
	}

	server {
	# Listen on port 80 for non-SSL connections
	listen 80;
	server_name YOURDOMAIN.XYZ;

	// @param - timeStamp - Javascript Date object or date string
	// @usage - timeSince(new Date().setFullYear(2019))
	function timeSince(timeStamp) {
	if (!(timeStamp instanceof Date)) {
	timeStamp = new Date(timeStamp);
	}

	if (isNaN(timeStamp.getDate())) {
	return "Invalid date";
	}