Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhere
commit1a507b9cf75bcb2de2391c584539e0ff202549bf
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 19:10:14 +0000 (10 11:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Nov 2009 19:10:14 +0000 (10 11:10 -0800)
tree50013deffff4af5b2bade8332d1294f1c4ddbcd8
parent4751f11224600ab25adb0a200fec55a734bc2936
parentf01d74960363736caaf4d98d39555e99bdc72c25
Merge branch 'jn/maint-http-fetch-mingw' into jn/help-everywhere

* jn/maint-http-fetch-mingw:
  http-fetch: add missing initialization of argv0_path
  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