summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | | use persistent memory for rejected pathsClemens Buchacher2010-12-144-42/+38
| * | | | | | | | | | | | | | | | | | | | | | do not overwrite files in leading pathClemens Buchacher2010-12-144-10/+31
| * | | | | | | | | | | | | | | | | | | | | | lstat_cache: optionally return match_lenClemens Buchacher2010-12-141-16/+27
| * | | | | | | | | | | | | | | | | | | | | | add function check_ok_to_remove()Clemens Buchacher2010-12-141-49/+58
| * | | | | | | | | | | | | | | | | | | | | | t7607: add leading-path testsClemens Buchacher2010-12-141-0/+51
| * | | | | | | | | | | | | | | | | | | | | | t7607: use test-lib functions and check MERGE_HEADClemens Buchacher2010-12-141-23/+15
| * | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/maint-no-openssl-build-fix' into maintJunio C Hamano2010-12-141-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | | Do not link with -lcrypto under NO_OPENSSLJunio C Hamano2010-12-081-0/+4
| * | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ja/maint-pull-rebase-doc' into maintJunio C Hamano2010-12-141-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tc/http-urls-ends-with-slash' into maintJunio C Hamano2010-12-149-40/+55
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/maint-hide-checkout-index-from-error' into maintJunio C Hamano2010-12-141-8/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/maint-reflog-bottom' into maintJunio C Hamano2010-12-143-2/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/rebase-abort-reflog-fix' into maintJunio C Hamano2010-12-142-9/+22
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'mz/maint-rebase-stat-config' into maintJunio C Hamano2010-12-141-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'gc/http-with-non-ascii-username-url' into maintJunio C Hamano2010-12-145-1/+51
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t800?-blame.sh: retitle uniquelyMichael J Gruber2010-12-132-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: flip executable bit on t9158Jeff King2010-12-131-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: add some script lint checksJeff King2010-12-131-2/+14
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid duplicate test number t7609Johannes Sixt2010-12-131-0/+0
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ja/maint-pull-rebase-doc'Junio C Hamano2010-12-121-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | git-pull.txt: Mention branch.autosetuprebaseJari Aalto2010-12-031-2/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'gb/web--browse'Junio C Hamano2010-12-122-85/+98
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | web--browse: better support for chromiumGiuseppe Bilotta2010-12-032-7/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | web--browse: support opera, seamonkey and elinksGiuseppe Bilotta2010-12-032-7/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | web--browse: split valid_tool listGiuseppe Bilotta2010-12-031-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | web--browse: coding styleGiuseppe Bilotta2010-12-031-83/+83
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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