| Commit message (Expand) | Author | Age | Files | Lines |
* | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhere | Jeff King | 2016-05-11 | 2 | -3/+16 |
* | Git 2.4.11v2.4.11 | Junio C Hamano | 2016-03-17 | 4 | -3/+15 |
* | Merge branch 'jk/path-name-safety-2.4' into maint-2.4 | Junio C Hamano | 2016-03-17 | 13 | -146/+84 |
|\ |
|
| * | list-objects: pass full pathname to callbacksjk/path-name-safety-2.4 | Jeff King | 2016-03-16 | 9 | -58/+26 |
| * | list-objects: drop name_path entirely | Jeff King | 2016-03-16 | 9 | -25/+19 |
| * | list-objects: convert name_path to a strbuf | Jeff King | 2016-03-16 | 3 | -36/+15 |
| * | show_object_with_name: simplify by using path_name() | Jeff King | 2016-03-16 | 1 | -34/+6 |
| * | http-push: stop using name_path | Jeff King | 2016-03-16 | 1 | -16/+7 |
| * | tree-diff: catch integer overflow in combine_diff_path allocation | Jeff King | 2016-03-16 | 2 | -4/+4 |
| * | add helpers for detecting size_t overflow | Jeff King | 2016-03-16 | 1 | -0/+34 |
|/ |
|
* | Git 2.4.10v2.4.10 | Junio C Hamano | 2015-09-28 | 4 | -3/+22 |
* | Sync with 2.3.10 | Junio C Hamano | 2015-09-28 | 27 | -28/+446 |
|\ |
|
| * | Git 2.3.10v2.3.10maint-2.3 | Junio C Hamano | 2015-09-28 | 4 | -3/+22 |
| * | Merge branch 'jk/xdiff-memory-limits' into maint-2.3 | Junio C Hamano | 2015-09-28 | 11 | -26/+57 |
| |\ |
|
| | * | merge-file: enforce MAX_XDIFF_SIZE on incoming files | Jeff King | 2015-09-28 | 1 | -1/+2 |
| | * | xdiff: reject files larger than ~1GB | Jeff King | 2015-09-28 | 3 | -1/+14 |
| | * | react to errors in xdi_diff | Jeff King | 2015-09-28 | 7 | -24/+41 |
| * | | Merge branch 'jk/transfer-limit-redirection' into maint-2.3 | Junio C Hamano | 2015-09-28 | 6 | -15/+78 |
| |\ \ |
|
| | * | | http: limit redirection depth | Blake Burkhart | 2015-09-25 | 3 | -0/+8 |
| | * | | http: limit redirection to protocol-whitelist | Blake Burkhart | 2015-09-25 | 4 | -5/+27 |
| | * | | transport: refactor protocol whitelist code | Jeff King | 2015-09-25 | 2 | -10/+43 |
| * | | | Merge branch 'jk/transfer-limit-protocol' into maint-2.3 | Junio C Hamano | 2015-09-28 | 13 | -1/+306 |
| |\ \ \
| | |/ /
| | | /
| | |/
| |/| |
|
| | * | submodule: allow only certain protocols for submodule fetches | Jeff King | 2015-09-23 | 2 | -0/+52 |
| | * | transport: add a protocol-whitelist environment variable | Jeff King | 2015-09-23 | 11 | -1/+254 |
| |/ |
|
* | | Git 2.4.9v2.4.9 | Junio C Hamano | 2015-09-04 | 4 | -3/+13 |
* | | Sync with 2.3.9 | Junio C Hamano | 2015-09-04 | 7 | -26/+49 |
|\ \
| |/ |
|
| * | Git 2.3.9v2.3.9 | Junio C Hamano | 2015-09-04 | 4 | -3/+13 |
| * | Sync with 2.2.3 | Junio C Hamano | 2015-09-04 | 6 | -25/+38 |
| |\ |
|
| | * | Git 2.2.3v2.2.3maint-2.2 | Junio C Hamano | 2015-09-04 | 4 | -3/+13 |
| | * | Merge branch 'jk/long-paths' into maint-2.2 | Junio C Hamano | 2015-09-04 | 4 | -24/+27 |
| | |\ |
|
| | | * | show-branch: use a strbuf for reflog descriptions | Jeff King | 2015-09-04 | 1 | -2/+4 |
| | | * | read_info_alternates: handle paths larger than PATH_MAX | Jeff King | 2015-09-04 | 1 | -6/+3 |
| | | * | notes: use a strbuf in add_non_note | Jeff King | 2015-09-04 | 1 | -9/+10 |
| | | * | verify_absent: allow filenames longer than PATH_MAX | Jeff King | 2015-09-04 | 1 | -7/+10 |
| | |/ |
|
* | | | Git 2.4.8v2.4.8 | Junio C Hamano | 2015-08-03 | 4 | -5/+25 |
* | | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maint | Junio C Hamano | 2015-08-03 | 2 | -1/+26 |
|\ \ \ |
|
| * | | | rebase -i: do not leave a CHERRY_PICK_HEAD file behindjs/rebase-i-clean-up-upon-continue-to-skip | Johannes Schindelin | 2015-06-29 | 2 | -2/+6 |
| * | | | t3404: demonstrate CHERRY_PICK_HEAD bug | Johannes Schindelin | 2015-06-29 | 1 | -0/+21 |
| | |/
| |/| |
|
* | | | Merge branch 'ss/clone-guess-dir-name-simplify' into maint | Junio C Hamano | 2015-08-03 | 1 | -13/+6 |
|\ \ \ |
|
| * | | | clone: simplify string handling in guess_dir_name()ss/clone-guess-dir-name-simplify | Sebastian Schuberth | 2015-07-09 | 1 | -13/+6 |
* | | | | Merge branch 'sg/completion-commit-cleanup' into maint | Junio C Hamano | 2015-08-03 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | completion: teach 'scissors' mode to 'git commit --cleanup='sg/completion-commit-cleanup | SZEDER Gábor | 2015-06-08 | 1 | -1/+1 |
* | | | | | Merge branch 'pt/am-abort-fix' into maint | Junio C Hamano | 2015-08-03 | 2 | -8/+104 |
|\ \ \ \ \ |
|
| * | | | | | am --abort: keep unrelated commits on unborn branchpt/am-abort-fix | Paul Tan | 2015-06-08 | 2 | -1/+12 |
| * | | | | | am --abort: support aborting to unborn branch | Paul Tan | 2015-06-08 | 2 | -1/+25 |
| * | | | | | am --abort: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 | 2 | -1/+28 |
| * | | | | | am --skip: support skipping while on unborn branch | Paul Tan | 2015-06-08 | 2 | -3/+11 |
| * | | | | | am -3: support 3way merge on unborn branch | Paul Tan | 2015-06-08 | 2 | -1/+11 |
| * | | | | | am --skip: revert changes introduced by failed 3way merge | Paul Tan | 2015-06-08 | 2 | -1/+17 |
| | |_|/ /
| |/| | | |
|
* | | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maint | Junio C Hamano | 2015-08-03 | 3 | -7/+83 |
|\ \ \ \ \ |
|