Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am -3: do not let failed merge from completing the error codepathjc/am-3-fallback-regression-fix | Junio C Hamano | 2015-10-09 | 1 | -16/+33 |
* | Git 2.6.1v2.6.1 | Junio C Hamano | 2015-09-28 | 4 | -3/+22 |
* | Sync with v2.5.4 | Junio C Hamano | 2015-09-28 | 29 | -30/+486 |
|\ | |||||
| * | Git 2.5.4v2.5.4 | Junio C Hamano | 2015-09-28 | 4 | -3/+22 |
| * | Sync with 2.4.10 | Junio C Hamano | 2015-09-28 | 28 | -29/+466 |
| |\ | |||||
| | * | 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.6v2.6.0 | Junio C Hamano | 2015-09-28 | 2 | -1/+6 |
* | | | | Git 2.6-rc3v2.6.0-rc3 | Junio C Hamano | 2015-09-21 | 1 | -1/+1 |
* | | | | Merge branch 'rj/mailmap-ramsay' | Junio C Hamano | 2015-09-21 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | mailmap: update my entry with new email addressrj/mailmap-ramsay | Ramsay Jones | 2015-09-16 | 1 | -1/+1 |
* | | | | | Merge branch 'bn/send-email-smtp-auth-error-message-fix' | Junio C Hamano | 2015-09-21 | 1 | -1/+1 |
|\ \ \ \ \ | |||||
| * | | | | | send-email: fix uninitialized var warning for $smtp_authbn/send-email-smtp-auth-error-message-fix | Brian Norris | 2015-09-21 | 1 | -1/+1 |
* | | | | | | Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com/git-l10n/git-po | Junio C Hamano | 2015-09-21 | 8 | -11681/+14967 |
|\ \ \ \ \ \ | |||||
| * | | | | | | l10n: de.po: better language for one string | Phillip Sz | 2015-09-20 | 1 | -1/+1 |
| * | | | | | | l10n: de.po: translate 2 messages | Ralf Thielow | 2015-09-20 | 1 | -101/+108 |
| * | | | | | | l10n: Update and review Vietnamese translation (2440t) | Tran Ngoc Quan | 2015-09-21 | 1 | -91/+90 |
| * | | | | | | l10n: fr.po v2.6.0 round 2 (2440t) | Jean-Noel Avila | 2015-09-21 | 1 | -112/+148 |
| * | | | | | | l10n: zh_CN: for git v2.6.0 l10n round 2 | Jiang Xin | 2015-09-21 | 1 | -78/+77 |
| * | | | | | | l10n: ca.po: update translation | Alex Henrie | 2015-09-21 | 1 | -1760/+2159 |
| * | | | | | | l10n: git.pot: v2.6.0 round 2 (3 improvements) | Jiang Xin | 2015-09-21 | 1 | -76/+72 |
| * | | | | | | Merge branch 'master' of git://github.com/git-l10n/git-po | Jiang Xin | 2015-09-21 | 7 | -9913/+12763 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | |||||
| | * | | | | | l10n: de.po: translate 123 new messages | Ralf Thielow | 2015-09-21 | 1 | -1640/+2125 |
| | * | | | | | l10n: fr.po v2.6.0 round 1 (2441t) | Jean-Noel Avila | 2015-09-21 | 1 | -1638/+2086 |
| | * | | | | | Merge branch 'master' of github.com:jiangxin/git | Jiang Xin | 2015-09-10 | 2 | -1814/+2390 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | l10n: zh_CN: for git v2.6.0 l10n round 1 | Jiang Xin | 2015-09-08 | 1 | -1607/+2067 |
| | | * | | | | | Merge branch 'master' of github.com:jiangxin/git into master | Jiang Xin | 2015-09-05 | 2 | -214/+330 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | l10n: zh_CN: Update Git Glossary: "commit message" | Ray Chen | 2015-08-25 | 1 | -0/+1 |
| | | | * | | | | | l10n: zh_CN: Update Git Glossary: pickaxe | Ray Chen | 2015-08-23 | 1 | -1/+1 |
| | | | * | | | | | l10n: zh_CN: Update Git Glossary: fork | Ray Chen | 2015-08-23 | 1 | -2/+2 |
| | | | * | | | | | l10n: zh_CN: Update Git Glossary: tag | Ray Chen | 2015-08-23 | 1 | -1/+1 |
| | | | * | | | | | l10n: zh_CN: Update Git Glossary: "dumb", "smart" | Ray Chen | 2015-08-23 | 1 | -2/+2 |
| | | | * | | | | | l10n: zh_CN: Update Git Glossary: SHA-1 | Ray Chen | 2015-08-23 | 1 | -1/+1 |
| | | | * | | | | | l10n: zh_CN: Add Surrounding Spaces | Ray Chen | 2015-08-10 | 1 | -23/+23 |
| | | | * | | | | | l10n: zh_CN: Add translations for Git glossary | Jiang Xin | 2015-08-07 | 1 | -117/+233 |
| | | | * | | | | | l10n: TEAMS: stash inactive zh_CN team members | Jiang Xin | 2015-08-04 | 2 | -9/+8 |
| | | | * | | | | | l10n: zh_CN: Update Translation of "tag" | Ray Chen | 2015-07-30 | 1 | -67/+67 |
| | | | * | | | | | l10n: zh_CN: Unify Translation of "packfile" | Ray Chen | 2015-07-28 | 1 | -3/+3 |