summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/parse-options-extra'Junio C Hamano2010-12-127-198/+303
|\
| * update-index: migrate to parse-options APIJonathan Nieder2010-12-071-149/+243
| * setup: save prefix (original cwd relative to toplevel) in startup_infoNguyễn Thái Ngọc Duy2010-12-072-1/+4
| * parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTIONJonathan Nieder2010-12-072-1/+3
| * parse-options: allow git commands to invent new option typesJonathan Nieder2010-12-072-1/+10
| * parse-options: never suppress arghelp if LITERAL_ARGHELP is setJonathan Nieder2010-12-071-1/+2
| * parse-options: do not infer PARSE_OPT_NOARG from option typeStephen Boyd2010-12-071-17/+2
| * parse-options: sanity check PARSE_OPT_NOARG flagJonathan Nieder2010-12-071-0/+13
| * parse-options: move NODASH sanity checks to parse_options_checkJonathan Nieder2010-12-071-7/+7
| * parse-options: clearer reporting of API misuseJonathan Nieder2010-12-071-12/+11
| * parse-options: Don't call parse_options_check() so muchStephen Boyd2010-12-064-9/+8
* | Merge branch 'js/configurable-tab'Junio C Hamano2010-12-127-19/+190
|\ \
| * | Make the tab width used for whitespace checks configurableJohannes Sixt2010-12-017-21/+163
| * | Merge branch 'js/maint-apply-tab-in-indent-fix' into HEADJunio C Hamano2010-12-012-1/+30
| |\ \
| | * | apply --whitespace=fix: fix tab-in-indentJohannes Sixt2010-12-012-1/+30
* | | | Merge branch 'nd/maint-hide-checkout-index-from-error'Junio C Hamano2010-12-121-8/+8
|\ \ \ \
| * | | | entry.c: remove "checkout-index" from error messagesNguyễn Thái Ngọc Duy2010-11-291-8/+8
| | |_|/ | |/| |
* | | | Merge branch 'jn/gitweb-per-request-config'Junio C Hamano2010-12-122-3/+35
|\ \ \ \
| * | | | gitweb: document $per_request_config betterJonathan Nieder2010-11-291-2/+7
| * | | | gitweb: selectable configurations that change with each requestJakub Narebski2010-11-292-2/+29
| | |/ / | |/| |
* | | | Merge branch 'ef/help-cmd-prefix'Junio C Hamano2010-12-122-8/+41
|\ \ \ \
| * | | | help: always suggest common-cmds if prefix of cmdErik Faye-Lund2010-12-052-8/+41
| |/ / /
* | | | Merge branch 'tc/http-urls-ends-with-slash'Junio C Hamano2010-12-129-40/+55
|\ \ \ \
| * | | | http-fetch: rework url handlingTay Ray Chuan2010-11-261-11/+5
| * | | | http-push: add trailing slash at arg-parse time, instead of later onTay Ray Chuan2010-11-261-13/+2
| * | | | http-push: check path length before using itTay Ray Chuan2010-11-261-2/+10
| * | | | http-push: Normalise directory names when pushing to some WebDAV serversTay Ray Chuan2010-11-261-0/+4
| * | | | http-backend: use end_url_with_slash()Tay Ray Chuan2010-11-261-3/+1
| * | | | url: add str wrapper for end_url_with_slash()Tay Ray Chuan2010-11-262-0/+8
| * | | | shift end_url_with_slash() from http.[ch] to url.[ch]Tay Ray Chuan2010-11-265-9/+12
| * | | | t5550-http-fetch: add test for http-fetchTay Ray Chuan2010-11-261-1/+13
| * | | | t5550-http-fetch: add missing '&&'Tay Ray Chuan2010-11-261-1/+1
* | | | | Merge branch 'tc/format-patch-p'Junio C Hamano2010-12-122-0/+25
|\ \ \ \ \
| * | | | | format-patch: page output with --stdoutTay Ray Chuan2010-11-232-0/+25
* | | | | | Merge branch 'ef/win32-dirent'Junio C Hamano2010-12-127-248/+137
|\ \ \ \ \ \
| * | | | | | win32: use our own dirent.hErik Faye-Lund2010-11-237-271/+137
| * | | | | | msvc: opendir: handle paths ending with a slashErik Faye-Lund2010-11-231-0/+2
| * | | | | | win32: dirent: handle errorsErik Faye-Lund2010-11-232-2/+28
| * | | | | | msvc: opendir: do not start the searchErik Faye-Lund2010-11-231-7/+3
| * | | | | | msvc: opendir: allocate enough memoryErik Faye-Lund2010-11-231-5/+4
| * | | | | | msvc: opendir: fix malloc-failureErik Faye-Lund2010-11-231-4/+4
* | | | | | | Merge branch 'mz/rebase-i-verify'Junio C Hamano2010-12-123-0/+9
|\ \ \ \ \ \ \
| * | | | | | | rebase: support --verifyMartin von Zweigbergk2010-11-233-0/+9
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'mz/rebase-abort-reflog-fix'Junio C Hamano2010-12-122-9/+22
|\ \ \ \ \ \ \
| * | | | | | | rebase --abort: do not update branch refMartin von Zweigbergk2010-11-232-9/+22
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/maint-reflog-bottom'Junio C Hamano2010-12-123-2/+37
|\ \ \ \ \ \ \
| * | | | | | | reflogs: clear flags properly in corner caseJeff King2010-11-233-2/+37
* | | | | | | | Merge branch 'jk/asciidoc-update'Junio C Hamano2010-12-126-29/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | docs: default to more modern toolsetJeff King2010-11-246-29/+27
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mz/pull-rebase-rebased'Junio C Hamano2010-12-122-2/+15
|\ \ \ \ \ \ \ \
View Lorry Controller Status