aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* imap-send: only use CURLOPT_LOGIN_OPTIONS if it is actually availableJohannes Schindelin2015-10-26
* Git 2.4.10v2.4.10Junio C Hamano2015-09-28
* Sync with 2.3.10Junio C Hamano2015-09-28
|\
| * 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.4.9v2.4.9Junio C Hamano2015-09-04
* | Sync with 2.3.9Junio C Hamano2015-09-04
|\ \ | |/
| * 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.4.8v2.4.8Junio C Hamano2015-08-03
* | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-03
|\ \ \
| * | | rebase -i: do not leave a CHERRY_PICK_HEAD file behindJohannes Schindelin2015-06-29
| * | | t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin2015-06-29
| | |/ | |/|
* | | Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano2015-08-03
|\ \ \
| * | | clone: simplify string handling in guess_dir_name()Sebastian Schuberth2015-07-09
* | | | Merge branch 'sg/completion-commit-cleanup' into maintJunio C Hamano2015-08-03
|\ \ \ \
| * | | | completion: teach 'scissors' mode to 'git commit --cleanup='SZEDER Gábor2015-06-08
* | | | | Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-03
|\ \ \ \ \
| * | | | | am --abort: keep unrelated commits on unborn branchPaul Tan2015-06-08
| * | | | | am --abort: support aborting to unborn branchPaul Tan2015-06-08
| * | | | | am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-08
| * | | | | am --skip: support skipping while on unborn branchPaul Tan2015-06-08
| * | | | | am -3: support 3way merge on unborn branchPaul Tan2015-06-08
| * | | | | am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-08
| | |_|/ / | |/| | |
* | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-03
|\ \ \ \ \
| * | | | | read_loose_refs(): treat NULL_SHA1 loose references as brokenMichael Haggerty2015-06-08
| * | | | | read_loose_refs(): simplify function logicMichael Haggerty2015-06-03
| * | | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-02
| * | | | | t6301: new tests of for-each-ref error handlingMichael Haggerty2015-06-02
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-03
|\ \ \ \ \
| * | | | | commit: cope with scissors lines in commit messageSZEDER Gábor2015-06-09
| | |_|/ / | |/| | |
* | | | | Git 2.4.7v2.4.7Junio C Hamano2015-07-27
* | | | | Merge branch 'jk/pretty-encoding-doc' into maintJunio C Hamano2015-07-27
|\ \ \ \ \
| * | | | | docs: clarify that --encoding can produce invalid sequencesJeff King2015-06-17
| |/ / / /