shawndumas

[mergetool]
    prompt = false
    keepBackup = false
    keepTemporaries = false

[merge]
    tool = winmerge

[mergetool "winmerge"]
    name = WinMerge

jbenet

a simple git branching model (written in 2013)

This is a very simple git workflow. It (and variants) is in use by many people. I settled on it after using it very effectively at Athena. GitHub does something similar; Zach Holman mentioned it in this talk.

Update: Woah, thanks for all the attention. Didn't expect this simple rant to get popular.

jmason

import com.yammer.metrics.Metrics;
import com.yammer.metrics.core.*;
import com.yammer.metrics.reporting.GraphiteReporter;
import com.yammer.metrics.reporting.SocketProvider;
import com.yammer.metrics.stats.Snapshot;

import java.io.IOException;
import java.util.concurrent.TimeUnit;

/**

staltz

The introduction to Reactive Programming you've been missing

(by @andrestaltz)

---

This tutorial as a series of videos

If you prefer to watch video tutorials with live-coding, then check out this series I recorded with the same contents as in this article: Egghead.io - Introduction to Reactive Programming.

---

anaisbetts

package org.paulbetts.shroom.core;

import android.os.AsyncTask;

import com.squareup.okhttp.*;

import java.io.IOException;
import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.util.Arrays;

iautom8things

package main

import (
	"code.google.com/p/go.net/websocket"
	"fmt"
	"github.com/hybridgroup/gobot"
	"github.com/hybridgroup/gobot/platforms/beaglebone"
	"github.com/hybridgroup/gobot/platforms/gpio"
	"net/http"
	"strconv"

xcoulon

SLF4J Logger Template for Eclipse

In Preferences>Java>Editor>Templates, create a new template named logger in the Java type members context and with the following pattern:

/** The usual Logger.*/
private static final Logger LOGGER = LoggerFactory.getLogger(${enclosing_type}.class);
${:import('org.slf4j.Logger','org.slf4j.LoggerFactory')}

yodarjun

'use strict';

var ENV = process.env.NODE_ENV || 'local';

var gulp       = require('gulp');
var gutil      = require('gulp-util');
var bower      = require('bower');
var concat     = require('gulp-concat');
var gulpif     = require('gulp-if');
var less       = require('gulp-less');

ryane

---
- hosts: all

  vars:
    UBUNTU_COMMON_ROOT_PASSWORD: 'xxxxx'
    UBUNTU_COMMON_DEPLOY_PASSWORD: 'xxxxx'
    UBUNTU_COMMON_LOGWATCH_EMAIL: [email protected]
    ubuntu_common_deploy_user_name: deploy
    ubuntu_common_deploy_public_keys:
      - ~/.ssh/id_rsa.pub

zpratt

'use strict';

var google = global.google;

function positionOverlayByDimensions(projectedLatLng) {
    var offsetHeight = this.el.offsetHeight,
        offsetWidth = this.el.offsetWidth;

    this.el.style.top = projectedLatLng.y - offsetHeight + 'px';
    this.el.style.left = projectedLatLng.x - Math.floor(offsetWidth / 2) + 'px';