beekhof

# Put this in ~/.gitconfig

# https://git.wiki.kernel.org/index.php/Aliases
[alias]
	ci  = commit
	co  = checkout
        fp  = format-patch
	bl  = blame --date=short -M
	br  = !git branch --no-color | grep '*' | sed -e 's/^* //'
 	who = shortlog -s --

beekhof

[core]
        #pager = less $LESS -SFRX -SR +'/^---'
        pager = less $LESS -X -SFRX

[user]
	email = andrew@beekhof.net
	name = Andrew Beekhof

#[format]
#	pretty = format:%cn, %cr %h: %s

beekhof

git clone https://github.com/ClusterLabs/agents-lha
cd agents-lha
git branch linux-ha
git remote add rhat http://git.fedorahosted.org/git/resource-agents.git
git fetch rhat
git branch -t redhat rhat/master
git merge redhat


Here's my current .git/config for the merging repo