Martin Mose Hansen martinmose

Launch Sublime Text 2 from the Mac OS X Terminal

Sublime Text 2 ships with a CLI called subl (why not "sublime", go figure). This utility is hidden in the following folder (assuming you installed Sublime in /Applications like normal folk. If this following line opens Sublime Text for you, then bingo, you're ready.

open /Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl

You can find more (official) details about subl here: http://www.sublimetext.com/docs/2/osx_command_line.html

Installation

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

People

`:bowtie:`	😄 `:smile:`	😆 `:laughing:`
😊 `:blush:`	😃 `:smiley:`	☺️ `:relaxed:`
😏 `:smirk:`	😍 `:heart_eyes:`	😘 `:kissing_heart:`
😚 `:kissing_closed_eyes:`	😳 `:flushed:`	😌 `:relieved:`
😆 `:satisfied:`	😁 `:grin:`	😉 `:wink:`
😜 `:stuck_out_tongue_winking_eye:`	😝 `:stuck_out_tongue_closed_eyes:`	😀 `:grinning:`
😗 `:kissing:`	😙 `:kissing_smiling_eyes:`	😛 `:stuck_out_tongue:`

Setting up p4merge as diff and merge tool on Windows. Tried for Git version 1.8.4.msysgit.0.

Two alternatives are explained: using the command line, and directly editing the config file.

Setting up from the command line

Being the installation path "C:Program Files\Perforce\p4merge.exe", just run:

$ git config --global diff.tool p4merge

Initialize

gitflow	git
`git flow init`	`git init`
	`git commit --allow-empty -m "Initial commit"`
	`git checkout -b develop master`

Connect to the remote repository

Add Git Branch Name to Terminal Prompt (Linux/Mac)

Open ~/.bash_profile in your favorite editor and add the following content to the bottom.

# Git branch in prompt.

parse_git_branch() {

	#!/usr/bin/env bash

	uninstall() {
	list=`gem list --no-versions`
	for gem in $list; do
	gem uninstall $gem -aIx
	done
	gem list
	gem install bundler
	}

	# Colorful Bash Prompt, inspired by "Extravagant Zsh Prompt"
	# Screenshot: http://img.gf3.ca/d54942f474256ec26a49893681c49b5a.png
	# A big thanks to \amethyst on Freenode

	if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then export TERM=gnome-256color
	elif infocmp xterm-256color >/dev/null 2>&1; then export TERM=xterm-256color
	fi

	if tput setaf 1 &> /dev/null; then
	tput sgr0

	[merge]
	keepBackup = false
	tool = p4merge
	[mergetool "p4merge"]
	cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge "\"$PWD/$BASE\"" "\"$PWD/$REMOTE\"" "\"$PWD/$LOCAL\"" "\"$PWD/$MERGED\""
	keepTemporaries = false
	trustExitCode = false
	keepBackup = false
	[diff]
	tool = p4merge

	#!/usr/bin/env bash
	#
	# Bootstrap script for setting up a new OSX machine
	#
	# This should be idempotent so it can be run multiple times.
	#
	# Some apps don't have a cask and so still need to be installed by hand. These
	# include:
	#
	# - Twitter (app store)