From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 17 May 2009 02:49:42 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc0~165
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=671d1bc6a098d1015fbdd6e085d6daf12c1dce15;p=git.git

Merge branch 'maint'

* maint:
  test: checkout shouldn't say that HEAD has moved if it didn't
  completion: enhance "current branch" display
  completion: simplify "current branch" in __git_ps1()
  completion: fix PS1 display during a merge on detached HEAD
  builtin-checkout: Don't tell user that HEAD has moved before it has
  pre-commit.sample: don't print incidental SHA1
  tests: Add tests for missing format-patch long options
  api-parse-options.txt: use 'func' instead of 'funct'
  Turn on USE_ST_TIMESPEC for OpenBSD
  ls-tree manpage: output of ls-tree is compatible with update-index
  ls-tree manpage: use "unless" instead of "when ... is not"
---

671d1bc6a098d1015fbdd6e085d6daf12c1dce15