Merge branch 'jc/pickaxe'

diff --cc Documentation/git-rev-parse.txt
Simple merge

diff --cc Documentation/git.txt
Simple merge

diff --cc Makefile
Simple merge

diff --cc blame.c
Simple merge

diff --cc builtin.h
Simple merge

diff --cc diff.h
Simple merge

diff --cc git.c
Simple merge

diff --cc revision.c
Simple merge