From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Apr 2008 07:47:04 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.6-rc0~153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71349732c53a4c1b64729628b04db7b3c3f7606d;p=thirdparty%2Fgit.git

Merge branch 'maint'

* maint:
  git-fetch: fix status output when not storing tracking ref
  core-tutorial.txt: Fix showing the current behaviour.
  git-archive: ignore prefix when checking file attribute
  Fix documentation syntax of optional arguments in short options.
---

71349732c53a4c1b64729628b04db7b3c3f7606d