From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Nov 2013 22:34:43 +0000 (-0800)
Subject: Merge branch 'fc/trivial'
X-Git-Tag: v1.8.5-rc1~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/152a9c17a802379a3a48e025b74dedd76e2623cc

Merge branch 'fc/trivial'

A random collection of style fixes and minor doc updates.

* fc/trivial:
setup: trivial style fixes
run-command: trivial style fixes
diff: trivial style fix
revision: trivial style fixes
pretty: trivial style fix
describe: trivial style fixes
transport-helper: trivial style fix
sha1-name: trivial style cleanup
branch: trivial style fix
revision: add missing include
doc/pull: clarify the illustrations
t: replace pulls with merges
merge: simplify ff-only option
---

152a9c17a802379a3a48e025b74dedd76e2623cc