Merge branch 'maint'
commit71349732c53a4c1b64729628b04db7b3c3f7606d
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Apr 2008 07:47:04 +0000 (10 00:47 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Apr 2008 07:47:04 +0000 (10 00:47 -0700)
tree22cd6c2ca4223b1a442400334958269ea1fac3ec
parent2a5fe2545882721d6841bad11dae0f15b454bf0d
parentf59774add488a6c5fb440a4aaa7255f594b1027d
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.