From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 28 Aug 2009 03:42:38 +0000 (-0700)
Subject: Merge branch 'maint-1.6.2' into maint-1.6.3
X-Git-Tag: v1.6.4.2~4^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5e64650d938d7a23b73532b4a68bc6bd08cfd041;p=git.git

Merge branch 'maint-1.6.2' into maint-1.6.3

* maint-1.6.2:
  Fix overridable written with an extra 'e'
  Documentation: git-archive: mark --format as optional in summary
  Round-down years in "years+months" relative date view

Conflicts:
	Documentation/git-archive.txt
---

5e64650d938d7a23b73532b4a68bc6bd08cfd041
diff --cc Documentation/git-archive.txt
index bc132c87e,105a31a08..92444ddf1
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@@ -9,8 -9,7 +9,8 @@@ git-archive - Create an archive of file
  SYNOPSIS
  --------
  [verse]
- 'git archive' --format=<fmt> [--list] [--prefix=<prefix>/] [<extra>]
+ 'git archive' [--format=<fmt>] [--list] [--prefix=<prefix>/] [<extra>]
 +	      [--output=<file>] [--worktree-attributes]
  	      [--remote=<repo> [--exec=<git-upload-archive>]] <tree-ish>
  	      [path...]