From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 10 Jan 2010 08:52:04 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.0-rc0~117
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=83b10ca25fd49d25561fd6344bd8e40b8987f50a;p=git.git

Merge branch 'maint'

* maint:
  base85: Make the code more obvious instead of explaining the non-obvious
  base85: encode_85() does not use the decode table
  base85 debug code: Fix length byte calculation
  Documentation: tiny git config manual tweaks
  Documentation: git gc packs refs by default now
  checkout -m: do not try to fall back to --merge from an unborn branch
---

83b10ca25fd49d25561fd6344bd8e40b8987f50a