summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* git-prompt.sh: Don't error on null ${ZSH,BASH}_VERSION, $short_shavs/prompt-avoid-unset-variableVille Skyttä2016-06-061-3/+3
* Git 2.5.5v2.5.5Junio C Hamano2016-03-174-3/+15
* Merge branch 'maint-2.4' into maint-2.5Junio C Hamano2016-03-1715-147/+97
|\
| * Git 2.4.11v2.4.11Junio C Hamano2016-03-174-3/+15
| * Merge branch 'jk/path-name-safety-2.4' into maint-2.4Junio C Hamano2016-03-1713-146/+84
| |\
| | * list-objects: pass full pathname to callbacksjk/path-name-safety-2.4Jeff King2016-03-169-58/+26
| | * list-objects: drop name_path entirelyJeff King2016-03-169-25/+19
| | * list-objects: convert name_path to a strbufJeff King2016-03-163-36/+15
| | * show_object_with_name: simplify by using path_name()Jeff King2016-03-161-34/+6
| | * http-push: stop using name_pathJeff King2016-03-161-16/+7
| | * tree-diff: catch integer overflow in combine_diff_path allocationJeff King2016-03-162-4/+4
| | * add helpers for detecting size_t overflowJeff King2016-03-161-0/+34
| |/
* | Git 2.5.4v2.5.4Junio C Hamano2015-09-284-3/+22
* | Sync with 2.4.10Junio C Hamano2015-09-2828-29/+466
|\ \ | |/
| * Git 2.4.10v2.4.10Junio C Hamano2015-09-284-3/+22
| * Sync with 2.3.10Junio C Hamano2015-09-2827-28/+446
| |\
| | * 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.5.3v2.5.3Junio C Hamano2015-09-174-3/+21
* | | Merge branch 'dt/untracked-subdir' into maintJunio C Hamano2015-09-172-32/+282
|\ \ \
| * | | untracked cache: fix entry invalidationdt/untracked-subdirNguyễn Thái Ngọc Duy2015-08-192-13/+83
| * | | untracked-cache: fix subdirectory handlingDavid Turner2015-08-192-7/+79
| * | | t7063: use --force-untracked-cache to speed up a bitdt/untracked-sparseNguyễn Thái Ngọc Duy2015-08-191-1/+1
| * | | untracked-cache: support sparse checkoutDavid Turner2015-07-312-14/+122
* | | | Merge branch 'br/svn-doc-include-paths-config' into maintJunio C Hamano2015-09-171-0/+3
|\ \ \ \
| * | | | git-svn doc: mention "svn-remote.<name>.include-paths"br/svn-doc-include-paths-configBrett Randall2015-08-261-0/+3
* | | | | Merge branch 'ah/submodule-typofix-in-error' into maintJunio C Hamano2015-09-171-1/+1
|\ \ \ \ \
| * | | | | git-submodule: remove extraneous space from error messageah/submodule-typofix-in-errorAlex Henrie2015-08-281-1/+1
* | | | | | Merge branch 'js/maint-am-skip-performance-regression' into maintJunio C Hamano2015-09-171-1/+1
|\ \ \ \ \ \
| * | | | | | am --skip/--abort: merge HEAD/ORIG_HEAD tree into indexjs/maint-am-skip-performance-regressionJohannes Schindelin2015-09-091-1/+1
| | |_|_|/ / | |/| | | |
* | | | | | Git 2.5.2v2.5.2Junio C Hamano2015-09-044-3/+67
* | | | | | Sync with 2.4.9Junio C Hamano2015-09-048-27/+60
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Git 2.4.9v2.4.9Junio C Hamano2015-09-044-3/+13
| * | | | | Sync with 2.3.9Junio C Hamano2015-09-047-26/+49
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | 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