From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Sep 2013 18:42:41 +0000 (-0700)
Subject: Merge branch 'ta/user-manual'
X-Git-Tag: v1.8.5-rc0~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fbb07e3f37ab53febd0b2fc0f64811c68cd2492;p=thirdparty%2Fgit.git

Merge branch 'ta/user-manual'

Update the user's manual to more recent versions of Git.

* ta/user-manual:
  "git prune" is safe
  Remove irrelevant reference from "Tying it all together"
  Remove unnecessary historical note from "Object storage format"
  Improve section "Merging multiple trees"
  Improve section "Manipulating branches"
  Simplify "How to make a commit"
  Fix some typos and improve wording
  Use "git merge" instead of "git pull ."
  Use current output for "git repack"
  Use current "detached HEAD" message
  Call it "Git User Manual" and remove reference to very old Git version
---

8fbb07e3f37ab53febd0b2fc0f64811c68cd2492