Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 23:08:23 +0000 (16:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 3 Sep 2008 23:08:23 +0000 (16:08 -0700)
commit9b8ae93ad92efef59649a3a7c4bed162d2051059
tree0661cd870dec63e098efef7e1fb7db31505dbbb2
parent01914577ed42498d9e268684949d699e0272e964
parentde5d560c99c96e2955fb4d1d8a8fa6b469926292
Merge branch 'maint'

* maint:
  Start 1.6.0.2 maintenance cycle
  tests: use "git xyzzy" form (t7200 - t9001)
  tests: use "git xyzzy" form (t7000 - t7199)
  Fix passwd(5) ref and reflect that commit doens't use commit-tree
  improve handling of sideband message display
  tests: use "git xyzzy" form (t3600 - t6999)
  tests: use "git xyzzy" form (t0000 - t3599)
  checkout: fix message when leaving detached HEAD
  clone: fix creation of explicitly named target directory
  'git foo' program identifies itself without dash in die() messages
  setup_git_directory(): fix move to worktree toplevel directory
  update-index: fix worktree setup
  Start conforming code to "git subcmd" style
  read-tree: setup worktree if merge is required
  grep: fix worktree setup
  diff*: fix worktree setup

Conflicts:
RelNotes
t/t3900-i18n-commit.sh
t/t7003-filter-branch.sh
17 files changed:
builtin-blame.c
builtin-checkout.c
builtin-commit-tree.c
builtin-fetch-pack.c
builtin-update-index.c
t/t1007-hash-object.sh
t/t3900-i18n-commit.sh
t/t3901-i18n-patch.sh
t/t4012-diff-binary.sh
t/t5500-fetch-pack.sh
t/t7001-mv.sh
t/t7003-filter-branch.sh
t/t7004-tag.sh
t/t7101-reset.sh
t/t7201-co.sh
t/t7500-commit.sh
t/t7600-merge.sh