Dan Phillips dphilla

git merge-tree "git merge-base branch_1 branch_2" branch_1 branch_2 | grep -A3 "changed in both"

git log --oneline --decorate --all --graph for fun

header

something

bold

~~strike~~

	#!/bin/bash

	# This script installs tmux and configures it with common key bindings and settings.
	#
	# Usage:
	# chmod +x tmux.sh
	# ./tmux.sh or bash tmux.sh

	# Determine the OS
	ios="$(uname)"

	# basic mina puma.rb

	# Change to match your CPU core count
	workers 1 # note this will be the number of app instances running on the machine!

	# Min and Max threads per worker
	threads 0, 5

	app_dir = File.expand_path("../..", __FILE__)
	shared_dir = "#{app_dir}"

	# from mina production
	# Ubuntu 20.04
	# /etc/nginx/sites-available/mina symlinked to /etc/nginx/sites-enabled/mina
	# todo: more needed here for redirects, static pages, etc**

	upstream mina {
	server unix:///home/mina/app/shared/tmp/sockets/puma.sock;
	}

	server {

	# for examples

	eval "$(rbenv init -)"

	# If not running interactively, don't do anything
	case $- in
	i) ;;
	*) return;;
	esac