From: Junio C Hamano <junkio@cox.net>
Date: Sun, 31 Dec 2006 06:42:43 +0000 (-0800)
Subject: Merge branch 'master' into sp/mmap
X-Git-Tag: v1.5.0-rc1~64^2~3
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=76d4e079adba461c127641a1104772a62e38cd81;p=git.git

Merge branch 'master' into sp/mmap

* master:
  Documentation/config.txt (and repo-config manpage): mark-up fix.
  Teach Git how to parse standard power of 2 suffixes.
  Use /dev/null for update hook stdin.
  Redirect update hook stdout to stderr.
  Remove unnecessary argc parameter from run_command_v.
  Automatically detect a bare git repository.
  Replace "GIT_DIR" with GIT_DIR_ENVIRONMENT.
  Use PATH_MAX constant for --bare.
  Force core.filemode to false on Cygwin.
  Fix formatting for urls section of fetch, pull, and push manpages
  Fix yet another subtle xdl_merge() bug
  i18n: drop "encoding" header in the output after re-coding.
  commit-tree: cope with different ways "utf-8" can be spelled.
  Move commit reencoding parameter parsing to revision.c
  Documentation: minor rewording for git-log and git-show pages.
  Documentation: i18n commit log message notes.
  t3900: test log --encoding=none
  commit re-encoding: fix confusion between no and default conversion.
---

76d4e079adba461c127641a1104772a62e38cd81