Code

Merge branch 'maint-1.5.4' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 11 May 2008 19:09:12 +0000 (12:09 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 11 May 2008 19:09:12 +0000 (12:09 -0700)
commit3e08f5db65bcfe3ad238ee0de1cac2da84953cf3
treece9480bd5f59c93ed232a94e58f99e5f1c59940b
parent32a27b56662b1c7aa13f98c95f170ba5290c7559
parent32efcd91c6505ae28f87c0e9a3e2b3c0115017d8
Merge branch 'maint-1.5.4' into maint

* maint-1.5.4:
  wt-status.h: declare global variables as extern
  builtin-commit.c: add -u as short name for --untracked-files
  git-repack: re-enable parsing of -n command line option
builtin-commit.c