Merge branch 'maint-1.5.4' into maint
commit179c94b24ae87e28328f9b311489417b66bd62c9
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 Apr 2008 07:29:33 +0000 (10 00:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 Apr 2008 07:29:33 +0000 (10 00:29 -0700)
tree3458de6031a61992cf96700826c29096867cae43
parent1d2375ddfee18bd3effd2c1f98527cc2f8b1df0a
parentabea85d1e9ee0bd77e41e934534aa5d5cdd0593a
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  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.
Documentation/git-tag.txt
builtin-tag.c
parse-options.c