Joao Vitor Lacerda Guimaraes joaovitor

Download and install p4merge

Download the perforce visual tool suite from here: http://www.perforce.com/perforce/downloads/index.html
Copy only the p4merge.app file into your /Applications/ directory

Setup p4merge as a visual mergetool

Emerge Interactive GitHub Lunch and Learn

Delivered by Matthew McCullough on 2012-09-04 at EmergeInteractive.com in Portland, OR
Julian Pscheid [email protected]
Django Radonich-Camp [email protected]

Outline

Interactive Rebasing
- Traditional squash, reword and edit
- Fixup
Autosquash

Linux Backup Solutions

I've been looking for the best Linux backup system, and also reading lots of HN comments.

Instead of putting pros and cons of every backup system I'll just list some deal-breakers which would disqualify them.

Also I would like that you, the HN community, would add more deal breakers for these or other backup systems if you know some more and at the same time, if you have data to disprove some of the deal-breakers listed here (benchmarks, info about something being true for older releases but is fixed on newer releases), please share it so that I can edit this list accordingly.

Amanda (comments by sammcj)

It has a lot of management overhead and that's a problem if you don't have time for a full time backup administrator.

RailsConf 2015 Schedule

RailsConf 2015 Room 202 Day 1

Processing JSON using jq

jq is useful to slice, filter, map and transform structured json data.

Installing jq

On Mac OS

brew install jq

	#!/bin/sh

	git filter-branch --env-filter '

	an="$GIT_AUTHOR_NAME"
	am="$GIT_AUTHOR_EMAIL"
	cn="$GIT_COMMITTER_NAME"
	cm="$GIT_COMMITTER_EMAIL"

	if [ "$GIT_COMMITTER_EMAIL" = "[email protected]" ]

	{
	"AWSTemplateFormatVersion" : "2010-09-09",

	"Description" : "AWS CloudFormation template to deploy jenkins/nginx.",

	"Parameters" : {

	"KeyName" : {
	"Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
	"Type" : "String",

	#
	# Working with branches
	#

	# Get the current branch name (not so useful in itself, but used in
	# other aliases)
	branch-name = "!git rev-parse --abbrev-ref HEAD"
	# Push the current branch to the remote "origin", and set it to track
	# the upstream branch
	publish = "!git push -u origin $(git branch-name)"

	#!/bin/sh

	git_repo=$1
	[ -z "$git_repo" ] && git_repo="."
	cd $git_repo > /dev/null 2>&1
	if [ $? -ne 0 ]; then
	printf "Invalid directory path.\n"
	exit 1
	fi

	[alias]
	recent = "!git for-each-ref --sort=-committerdate refs/heads/ --format='%(committerdate:short) %(refname:short)' \| head -n 10"
	co = checkout
	cob = checkout -b
	coo = !git fetch && git checkout
	br = branch
	brd = branch -d
	brD = branch -D
	merged = branch --merged
	st = status