Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 20:36:26 +0000 (12:36 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 20:36:26 +0000 (12:36 -0800)
commit8ac7a77be668180d515e234d550cc661aa0c1ebd
tree8aa4710a131dbfd0722de487bcf91914882e39cd
parent6a93158c334fae92c5ca969cd0d0725c90af6b54
parentd629c40b0b8b63b0c8b33d52dcba0ed202d898d7
Merge branch 'maint'

* maint:
  merge: do not setup worktree twice
  check-ref-format: update usage string

Conflicts:
builtin-check-ref-format.c
builtin-check-ref-format.c
builtin-merge.c