From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 13 Jul 2008 22:45:38 +0000 (-0700)
Subject: Merge branch 'maint' to sync with 1.5.6.3
X-Git-Tag: v1.6.0-rc0~84
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=447d0cca45920bbe409361bb532444f810c75546;p=git.git

Merge branch 'maint' to sync with 1.5.6.3

* maint:
  GIT 1.5.6.3
  git-am: Do not exit silently if committer is unset
  t0004: fix timing bug
  git-mailinfo: document the -n option
  Fix backwards-incompatible handling of core.sharedRepository
---

447d0cca45920bbe409361bb532444f810c75546
diff --cc Documentation/git-mailinfo.txt
index cc52db3be,1e126f4a5..316bcc679
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@@ -8,7 -8,7 +8,7 @@@ git-mailinfo - Extracts patch and autho
  
  SYNOPSIS
  --------
- 'git mailinfo' [-k] [-u | --encoding=<encoding>] <msg> <patch>
 -'git-mailinfo' [-k] [-u | --encoding=<encoding> | -n] <msg> <patch>
++'git mailinfo' [-k] [-u | --encoding=<encoding> | -n] <msg> <patch>
  
  
  DESCRIPTION