From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Feb 2014 22:01:43 +0000 (-0800)
Subject: Merge branch 'al/docs'
X-Git-Tag: v2.0.0-rc0~151
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d8a1bac1d49dfe8879000e2bd07d138d3088f5b4

Merge branch 'al/docs'

A handful of documentation updates, all trivially harmless.

* al/docs:
docs/git-blame: explain more clearly the example pickaxe use
docs/git-clone: clarify use of --no-hardlinks option
docs/git-remote: capitalize first word of initial blurb
docs/merge-strategies: remove hyphen from mis-merges
---

d8a1bac1d49dfe8879000e2bd07d138d3088f5b4