summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Git 2.3.10v2.3.10maint-2.3Junio C Hamano2015-09-284-3/+22
* Merge branch 'jk/xdiff-memory-limits' into maint-2.3Junio C Hamano2015-09-2811-26/+57
|\
| * merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-281-1/+2
| * xdiff: reject files larger than ~1GBJeff King2015-09-283-1/+14
| * react to errors in xdi_diffJeff King2015-09-287-24/+41
* | Merge branch 'jk/transfer-limit-redirection' into maint-2.3Junio C Hamano2015-09-286-15/+78
|\ \
| * | http: limit redirection depthBlake Burkhart2015-09-253-0/+8
| * | http: limit redirection to protocol-whitelistBlake Burkhart2015-09-254-5/+27
| * | transport: refactor protocol whitelist codeJeff King2015-09-252-10/+43
* | | Merge branch 'jk/transfer-limit-protocol' into maint-2.3Junio C Hamano2015-09-2813-1/+306
|\ \ \ | |/ / | | / | |/ |/|
| * submodule: allow only certain protocols for submodule fetchesJeff King2015-09-232-0/+52
| * transport: add a protocol-whitelist environment variableJeff King2015-09-2311-1/+254
|/
* Git 2.3.9v2.3.9Junio C Hamano2015-09-044-3/+13
* Sync with 2.2.3Junio C Hamano2015-09-046-25/+38
|\
| * Git 2.2.3v2.2.3maint-2.2Junio C Hamano2015-09-044-3/+13
| * Merge branch 'jk/long-paths' into maint-2.2Junio C Hamano2015-09-044-24/+27
| |\
| | * show-branch: use a strbuf for reflog descriptionsJeff King2015-09-041-2/+4
| | * read_info_alternates: handle paths larger than PATH_MAXJeff King2015-09-041-6/+3
| | * notes: use a strbuf in add_non_noteJeff King2015-09-041-9/+10
| | * verify_absent: allow filenames longer than PATH_MAXJeff King2015-09-041-7/+10
| |/
* | Git 2.3.8v2.3.8Junio C Hamano2015-05-114-3/+26
* | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3Junio C Hamano2015-05-116-15/+16
|\ \
| * | log -L: improve error message on malformed argumentmm/usage-log-l-can-take-regexMatthieu Moy2015-04-202-5/+5
| * | Documentation: change -L:<regex> to -L:<funcname>Matthieu Moy2015-04-204-10/+11
* | | Merge branch 'jc/diff-no-index-d-f' into maint-2.3Junio C Hamano2015-05-112-2/+98
|\ \ \
| * | | diff-no-index: align D/F handling with that of normal Gitjc/diff-no-index-d-fJunio C Hamano2015-03-262-2/+33
| * | | diff-no-index: DWIM "diff D F" into "diff D/F F"Junio C Hamano2015-03-252-0/+65
* | | | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Junio C Hamano2015-05-111-2/+2
|\ \ \ \
| * | | | config: fix settings in default_user_config templateoh/fix-config-default-user-name-sectionOssi Herrala2015-04-171-2/+2
* | | | | Merge branch 'jc/epochtime-wo-tz' into maint-2.3Junio C Hamano2015-05-111-5/+9
|\ \ \ \ \
| * | | | | parse_date_basic(): let the system handle DST conversionjc/epochtime-wo-tzJunio C Hamano2015-04-151-2/+6
| * | | | | parse_date_basic(): return early when given a bogus timestampJunio C Hamano2015-04-151-3/+3
| | |/ / / | |/| | |
* | | | | Git 2.3.7v2.3.7Junio C Hamano2015-04-274-3/+25
* | | | | Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano2015-04-273-16/+24
|\ \ \ \ \
| * | | | | connect.c: ignore extra colon after hostnametb/connect-ipv6-parse-fixTorsten Bögershausen2015-04-083-16/+24
* | | | | | Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano2015-04-271-1/+1
|\ \ \ \ \ \
| * | | | | | completion: fix global bash variable leak on __gitcompappendma/bash-completion-leaking-xMárcio Almada2015-04-121-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/push-cert' into maintJunio C Hamano2015-04-271-0/+23
|\ \ \ \ \ \
| * | | | | | push --signed: tighten what the receiving end can ask to signjc/push-certJunio C Hamano2015-04-021-0/+23
* | | | | | | Git 2.3.6v2.3.6Junio C Hamano2015-04-214-3/+17
* | | | | | | Merge branch 'jk/colors' into maintJunio C Hamano2015-04-211-2/+7
|\ \ \ \ \ \ \
| * | | | | | | diff-highlight: do not split multibyte charactersjk/colorsKyle J. McKay2015-04-041-2/+7
* | | | | | | | Merge branch 'jk/test-annoyances' into maintJunio C Hamano2015-04-215-15/+24
|\ \ \ \ \ \ \ \
| * | | | | | | | t5551: make EXPENSIVE test cheaperjk/test-annoyancesJeff King2015-03-121-5/+14
| * | | | | | | | t5541: move run_with_cmdline_limit to test-lib.shJeff King2015-03-122-6/+6
| * | | | | | | | t: pass GIT_TRACE through ApacheJeff King2015-03-122-0/+2
| * | | | | | | | t: redirect stderr GIT_TRACE to descriptor 4Jeff King2015-03-121-4/+1
| * | | | | | | | t: translate SIGINT to an exitJeff King2015-03-121-0/+1
* | | | | | | | | Merge branch 'pt/enter-repo-comment-fix' into maintJunio C Hamano2015-04-211-8/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | enter_repo(): fix docs to match codept/enter-repo-comment-fixPaul Tan2015-03-311-8/+3
| | |_|_|/ / / / / | |/| | | | | | |