tyjak tyjak

1. Clone your fork:

git clone [email protected]:YOUR-USERNAME/YOUR-FORKED-REPO.git

2. Add remote from original repository in your forked repository:

cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git
git fetch upstream

vimdiff cheat sheet

##git mergetool

In the middle file (future merged file), you can navigate between conflicts with ]c and [c.

Choose which version you want to keep with :diffget //2 or :diffget //3 (the //2 and //3 are unique identifiers for the target/master copy and the merge/branch copy file names).

:diffupdate (to remove leftover spacing issues)

:only (once you’re done reviewing all conflicts, this shows only the middle/merged file)

GPG subkeys marked with the "authenticate" capability can be used for public key authentication with SSH. This is done using gpg-agent which, using the --enable-ssh-support option, can implement the agent protocol used by SSH.

Requirements

A working gpg2 setup is required. It may be possible to use gpg 1.4 but with gpg-agent compiled from gpg2. If you are using OS X 10.9 (Mavericks) then you may find the instructions [here][1] useful.

This puzzle has 3 parts:

A i3wm config that opens mutt in a dedicated workspace. $mod+m will switch to this workspace and will launch mutt, if not already running. Actually it doesn't launch mutt, but…
a small wrapper script, which opens a named pipe and then starts mutt.
a checkmail script which uses mailcheck(1) to tara check mail. If new mail is available, it blinks the CAPS LOCK led (which I mapped to CTRL anyway) and marks the mutt workspace via a bell.

Additional configuration:

set your terminal to mark urgent bells. In Termite the setting is "urgent_on_bell = true".
adopt you ~/.mailcheckrc to include paths to your mailboxes. In the simplest case it contains just the line "$(HOME)/Maildir/INBOX"

	So you've cloned somebody's repo from github, but now you want to fork it and contribute back. Never fear!

	Technically, when you fork "origin" should be your fork and "upstream" should be the project you forked; however, if you're willing to break this convention then it's easy.

	* Off the top of my head *

	1. Fork their repo on Github
	2. In your local, add a new remote to your fork; then fetch it, and push your changes up to it

	git remote add my-fork [email protected]

	#! /bin/sh
	# Usage: ./prowl.sh priority(-2 to 2) app event description
	# Example: ./prowl.sh 0 "transmission" "torrent has finished" "Coen Brothers Compilation has finised downloading"
	priority=$1
	app=$2
	event=$3
	description=$4
	apikey=fill_in_your_API_key_here

	if [ $# -ne 4 ]; then

	-- show running queries (pre 9.2)
	SELECT procpid, age(clock_timestamp(), query_start), usename, current_query
	FROM pg_stat_activity
	WHERE current_query != '<IDLE>' AND current_query NOT ILIKE '%pg_stat_activity%'
	ORDER BY query_start desc;

	-- show running queries (9.2)
	SELECT pid, age(clock_timestamp(), query_start), usename, query
	FROM pg_stat_activity
	WHERE query != '<IDLE>' AND query NOT ILIKE '%pg_stat_activity%'

	#!/bin/bash

	if [[ -f /tmp/aliases.old ]]; then
	rm -f /tmp/aliases.old
	fi

	if [[ -f /tmp/aliases.txt ]]; then
	mv /tmp/aliases.txt /tmp/aliases.old
	fi

	#!/usr/bin/env python

	import sys

	# Lamson is an application, but also the best way to read email without
	# struggling with "battery include" libraries.
	from lamson.encoding import from_string as parse_mail

	from pyelasticsearch import ElasticSearch
	from pyelasticsearch.exceptions import ElasticHttpNotFoundError

	set guifont=Monaco:h16
	set transparency=0