summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bitsRamsay Jones2016-03-041-1/+1
* 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.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
| | | * 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.4.8v2.4.8Junio C Hamano2015-08-034-5/+25
* | | Merge branch 'js/rebase-i-clean-up-upon-continue-to-skip' into maintJunio C Hamano2015-08-032-1/+26
|\ \ \
| * | | rebase -i: do not leave a CHERRY_PICK_HEAD file behindjs/rebase-i-clean-up-upon-continue-to-skipJohannes Schindelin2015-06-292-2/+6
| * | | t3404: demonstrate CHERRY_PICK_HEAD bugJohannes Schindelin2015-06-291-0/+21
| | |/ | |/|
* | | Merge branch 'ss/clone-guess-dir-name-simplify' into maintJunio C Hamano2015-08-031-13/+6
|\ \ \
| * | | clone: simplify string handling in guess_dir_name()ss/clone-guess-dir-name-simplifySebastian Schuberth2015-07-091-13/+6
* | | | Merge branch 'sg/completion-commit-cleanup' into maintJunio C Hamano2015-08-031-1/+1
|\ \ \ \
| * | | | completion: teach 'scissors' mode to 'git commit --cleanup='sg/completion-commit-cleanupSZEDER Gábor2015-06-081-1/+1
* | | | | Merge branch 'pt/am-abort-fix' into maintJunio C Hamano2015-08-032-8/+104
|\ \ \ \ \
| * | | | | am --abort: keep unrelated commits on unborn branchpt/am-abort-fixPaul Tan2015-06-082-1/+12
| * | | | | am --abort: support aborting to unborn branchPaul Tan2015-06-082-1/+25
| * | | | | am --abort: revert changes introduced by failed 3way mergePaul Tan2015-06-082-1/+28
| * | | | | am --skip: support skipping while on unborn branchPaul Tan2015-06-082-3/+11
| * | | | | am -3: support 3way merge on unborn branchPaul Tan2015-06-082-1/+11
| * | | | | am --skip: revert changes introduced by failed 3way mergePaul Tan2015-06-082-1/+17
| | |_|/ / | |/| | |
* | | | | Merge branch 'mh/reporting-broken-refs-from-for-each-ref' into maintJunio C Hamano2015-08-033-7/+83
|\ \ \ \ \
| * | | | | read_loose_refs(): treat NULL_SHA1 loose references as brokenmh/reporting-broken-refs-from-for-each-refMichael Haggerty2015-06-082-1/+11
| * | | | | read_loose_refs(): simplify function logicMichael Haggerty2015-06-031-7/+12
| * | | | | for-each-ref: report broken references correctlyMichael Haggerty2015-06-022-1/+6
| * | | | | t6301: new tests of for-each-ref error handlingMichael Haggerty2015-06-021-0/+56
| | |_|_|/ | |/| | |
* | | | | Merge branch 'sg/commit-cleanup-scissors' into maintJunio C Hamano2015-08-032-5/+28
|\ \ \ \ \
| * | | | | commit: cope with scissors lines in commit messagesg/commit-cleanup-scissorsSZEDER Gábor2015-06-092-5/+28
| | |_|/ / | |/| | |
* | | | | Git 2.4.7v2.4.7Junio C Hamano2015-07-274-3/+57
* | | | | Merge branch 'jk/pretty-encoding-doc' into maintJunio C Hamano2015-07-271-1/+4
|\ \ \ \ \
| * | | | | docs: clarify that --encoding can produce invalid sequencesjk/pretty-encoding-docJeff King2015-06-171-1/+4
| |/ / / /
View Lorry Controller Status