diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-10 19:10:14 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-10 19:10:14 (GMT) |
| commit | 1a507b9cf75bcb2de2391c584539e0ff202549bf (patch) | |
| tree | 50013deffff4af5b2bade8332d1294f1c4ddbcd8 /builtin-merge-recursive.c | |
| parent | 4751f11224600ab25adb0a200fec55a734bc2936 (diff) | |
| parent | f01d74960363736caaf4d98d39555e99bdc72c25 (diff) | |
| download | git-1a507b9cf75bcb2de2391c584539e0ff202549bf.zip git-1a507b9cf75bcb2de2391c584539e0ff202549bf.tar.gz git-1a507b9cf75bcb2de2391c584539e0ff202549bf.tar.bz2 | |
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
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions