aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* Git 2.3.10v2.3.10Junio C Hamano2015-09-28
* Merge branch 'jk/xdiff-memory-limits' into maint-2.3Junio C Hamano2015-09-28
|\
| * merge-file: enforce MAX_XDIFF_SIZE on incoming filesJeff King2015-09-28
| * xdiff: reject files larger than ~1GBJeff King2015-09-28
| * react to errors in xdi_diffJeff King2015-09-28
* | Merge branch 'jk/transfer-limit-redirection' into maint-2.3Junio C Hamano2015-09-28
|\ \
| * | http: limit redirection depthBlake Burkhart2015-09-25
| * | http: limit redirection to protocol-whitelistBlake Burkhart2015-09-25
| * | transport: refactor protocol whitelist codeJeff King2015-09-25
* | | Merge branch 'jk/transfer-limit-protocol' into maint-2.3Junio C Hamano2015-09-28
|\ \ \ | |/ / | | / | |/ |/|
| * submodule: allow only certain protocols for submodule fetchesJeff King2015-09-23
| * transport: add a protocol-whitelist environment variableJeff King2015-09-23
|/
* Git 2.3.9v2.3.9Junio C Hamano2015-09-04
* Sync with 2.2.3Junio C Hamano2015-09-04
|\
| * Git 2.2.3v2.2.3Junio C Hamano2015-09-04
| * Merge branch 'jk/long-paths' into maint-2.2Junio C Hamano2015-09-04
| |\
| | * show-branch: use a strbuf for reflog descriptionsJeff King2015-09-04
| | * read_info_alternates: handle paths larger than PATH_MAXJeff King2015-09-04
| | * notes: use a strbuf in add_non_noteJeff King2015-09-04
| | * verify_absent: allow filenames longer than PATH_MAXJeff King2015-09-04
| |/
* | Git 2.3.8v2.3.8Junio C Hamano2015-05-11
* | Merge branch 'mm/usage-log-l-can-take-regex' into maint-2.3Junio C Hamano2015-05-11
|\ \
| * | log -L: improve error message on malformed argumentMatthieu Moy2015-04-20
| * | Documentation: change -L:<regex> to -L:<funcname>Matthieu Moy2015-04-20
* | | Merge branch 'jc/diff-no-index-d-f' into maint-2.3Junio C Hamano2015-05-11
|\ \ \
| * | | diff-no-index: align D/F handling with that of normal GitJunio C Hamano2015-03-26
| * | | diff-no-index: DWIM "diff D F" into "diff D/F F"Junio C Hamano2015-03-25
* | | | Merge branch 'oh/fix-config-default-user-name-section' into maint-2.3Junio C Hamano2015-05-11
|\ \ \ \
| * | | | config: fix settings in default_user_config templateOssi Herrala2015-04-17
* | | | | Merge branch 'jc/epochtime-wo-tz' into maint-2.3Junio C Hamano2015-05-11
|\ \ \ \ \
| * | | | | parse_date_basic(): let the system handle DST conversionJunio C Hamano2015-04-15
| * | | | | parse_date_basic(): return early when given a bogus timestampJunio C Hamano2015-04-15
| | |/ / / | |/| | |
* | | | | Git 2.3.7v2.3.7Junio C Hamano2015-04-27
* | | | | Merge branch 'tb/connect-ipv6-parse-fix' into maintJunio C Hamano2015-04-27
|\ \ \ \ \
| * | | | | connect.c: ignore extra colon after hostnameTorsten Bögershausen2015-04-08
* | | | | | Merge branch 'ma/bash-completion-leaking-x' into maintJunio C Hamano2015-04-27
|\ \ \ \ \ \
| * | | | | | completion: fix global bash variable leak on __gitcompappendMárcio Almada2015-04-12
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jc/push-cert' into maintJunio C Hamano2015-04-27
|\ \ \ \ \ \
| * | | | | | push --signed: tighten what the receiving end can ask to signJunio C Hamano2015-04-02
* | | | | | | Git 2.3.6v2.3.6Junio C Hamano2015-04-21
* | | | | | | Merge branch 'jk/colors' into maintJunio C Hamano2015-04-21
|\ \ \ \ \ \ \
| * | | | | | | diff-highlight: do not split multibyte charactersKyle J. McKay2015-04-04
* | | | | | | | Merge branch 'jk/test-annoyances' into maintJunio C Hamano2015-04-21
|\ \ \ \ \ \ \ \
| * | | | | | | | t5551: make EXPENSIVE test cheaperJeff King2015-03-12
| * | | | | | | | t5541: move run_with_cmdline_limit to test-lib.shJeff King2015-03-12
| * | | | | | | | t: pass GIT_TRACE through ApacheJeff King2015-03-12
| * | | | | | | | t: redirect stderr GIT_TRACE to descriptor 4Jeff King2015-03-12
| * | | | | | | | t: translate SIGINT to an exitJeff King2015-03-12
* | | | | | | | | Merge branch 'pt/enter-repo-comment-fix' into maintJunio C Hamano2015-04-21
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | enter_repo(): fix docs to match codePaul Tan2015-03-31
| | |_|_|/ / / / / | |/| | | | | | |