From: Junio C Hamano <junkio@cox.net>
Date: Sat, 18 Mar 2006 04:43:15 +0000 (-0800)
Subject: Merge branch 'master' into next
X-Git-Tag: v1.3.0-rc1~22
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=c816a6bc5a8494556e00c36d4ed4596a04efd38a;hp=-c;p=git.git

Merge branch 'master' into next

* master:
  3% tighter packs for free
  Rewrite synopsis to clarify the two primary uses of git-checkout.
  Fix minor typo.
  Reference git-commit-tree for env vars.
  Clarify git-rebase example commands.
  Document the default source of template files.
  Call out the two different uses of git-branch and fix a typo.
  Add git-show reference
---

c816a6bc5a8494556e00c36d4ed4596a04efd38a