Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | dir: allow exclusions from blob in addition to filejh/dir-add-exclude-from-blob | Jeff Hostetler | 2017-10-27 | 2 | -31/+104 |
* | Merge branch 'mh/ref-locking-fix' | Junio C Hamano | 2017-10-26 | 2 | -1/+142 |
|\ | |||||
| * | files_transaction_prepare(): fix handling of ref lock failuremh/ref-locking-fix | Michael Haggerty | 2017-10-25 | 2 | -9/+9 |
| * | t1404: add a bunch of tests of D/F conflicts | Michael Haggerty | 2017-10-25 | 1 | -0/+141 |
* | | Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-po | Junio C Hamano | 2017-10-24 | 12 | -24768/+42782 |
|\ \ | |||||
| * \ | Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/git | Jiang Xin | 2017-10-24 | 1 | -2414/+2557 |
| |\ \ | |||||
| | * | | l10n: zh_CN: review for git v2.15.0 l10n round 2 | Ray Chen | 2017-10-24 | 1 | -2/+2 |
| | * | | l10n: zh_CN: for git v2.15.0 l10n round 2 | Jiang Xin | 2017-10-24 | 1 | -2414/+2557 |
| |/ / | |||||
| * | | Merge branch 'master' of https://github.com/ralfth/git-po-de | Jiang Xin | 2017-10-24 | 1 | -2448/+2630 |
| |\ \ | |||||
| | * | | l10n: de.po: fix typos | Andre Hinrichs | 2017-10-23 | 1 | -14/+14 |
| | * | | l10n: de.po: translate 70 new messages | Ralf Thielow | 2017-10-23 | 1 | -2435/+2617 |
| |/ / | |||||
| * | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2017-10-22 | 1 | -50/+50 |
| * | | Merge branch 'master' of https://github.com/vnwildman/git | Jiang Xin | 2017-10-22 | 1 | -51/+55 |
| |\ \ | |||||
| | * | | l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2 | Tran Ngoc Quan | 2017-10-19 | 1 | -51/+55 |
| * | | | Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/git | Jiang Xin | 2017-10-19 | 1 | -2427/+2612 |
| |\ \ \ | |||||
| | * | | | l10n: fr.po: v2.15.0 round 2 | Jean-Noel Avila | 2017-10-18 | 1 | -2424/+2612 |
| | * | | | l10n: fr.po change translation of "First, rewinding" | Nicolas Cornu | 2017-10-18 | 1 | -2/+1 |
| | * | | | l10n: fr.po fix some mistakes | Jean-Noel Avila | 2017-10-18 | 1 | -7/+5 |
| | |/ / | |||||
| * | | | Merge branch 'master' of git://github.com/nafmo/git-l10n-sv | Jiang Xin | 2017-10-19 | 1 | -55/+58 |
| |\ \ \ | |||||
| | * | | | l10n: sv.po: Update Swedish translation (3245t0f0u) | Peter Krefting | 2017-10-18 | 1 | -55/+58 |
| | |/ / | |||||
| * | | | Merge branch 'master' of https://github.com/Softcatala/git-po | Jiang Xin | 2017-10-19 | 1 | -3008/+2991 |
| |\ \ \ | |||||
| | * | | | l10n: Update Catalan translation | Jordi Mas | 2017-10-17 | 1 | -3008/+2991 |
| | |/ / | |||||
| * | | | Merge branch 'translation' of https://github.com/ChrisADR/git-po | Jiang Xin | 2017-10-19 | 1 | -50/+54 |
| |\ \ \ | |||||
| | * | | | l10n: es.po: v2.15.0 round 2 | Christopher Díaz Riveros | 2017-10-16 | 1 | -50/+54 |
| | |/ / | |||||
| * | | | l10n: ko.po: Update Korean translation | Changwoo Ryu | 2017-10-17 | 1 | -2411/+2535 |
| |/ / | |||||
| * | | l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed) | Jiang Xin | 2017-10-17 | 1 | -47/+48 |
| * | | Merge branch 'master' of git://github.com/git-l10n/git-po | Jiang Xin | 2017-10-17 | 7 | -12060/+29445 |
| |\ \ | |||||
| | * | | l10n: ru.po: update Russian translation | Dimitriy Ryazantcev | 2017-10-15 | 1 | -2381/+2521 |
| | * | | Merge branch 'master' of git://github.com/alshopov/git-po | Jiang Xin | 2017-10-14 | 1 | -2419/+2554 |
| | |\ \ | |||||
| | | * | | l10n: bg.po: Updated Bulgarian translation (3245t) | Alexander Shopov | 2017-10-14 | 1 | -2419/+2554 |
| | * | | | l10n: sv.po: Update Swedish translation (3245t0f0u) | Peter Krefting | 2017-10-11 | 1 | -2475/+2674 |
| | |/ / | |||||
| | * | | Merge branch 'master' of https://github.com/vnwildman/git | Jiang Xin | 2017-10-11 | 1 | -2425/+2598 |
| | |\ \ | |||||
| | | * | | l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 | Tran Ngoc Quan | 2017-10-09 | 1 | -2425/+2598 |
| | * | | | l10n: es.po: Update translation v2.15.0 round 1 | Christopher Díaz | 2017-10-08 | 1 | -2732/+3574 |
| | |/ / | |||||
| | * | | Merge branch 'maint' of git://github.com/git-l10n/git-po | Jiang Xin | 2017-10-08 | 2 | -0/+15757 |
| | |\ \ | |||||
| | | * | | l10n: es.po: spanish added to TEAMS | Christopher Díaz | 2017-08-27 | 1 | -0/+4 |
| | | * | | l10n: es.po: initial Spanish version git 2.14.0 | Christopher Díaz | 2017-08-27 | 1 | -0/+15753 |
| | * | | | l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed) | Jiang Xin | 2017-10-08 | 1 | -2360/+2499 |
* | | | | | Sync with 2.14.3 | Junio C Hamano | 2017-10-23 | 1 | -0/+24 |
|\ \ \ \ \ | |||||
| * | | | | | Git 2.14.3v2.14.3maint-2.14 | Junio C Hamano | 2017-10-23 | 2 | -1/+25 |
| * | | | | | Merge branch 'jk/info-alternates-fix' into maint | Junio C Hamano | 2017-10-23 | 1 | -20/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'jc/fetch-refspec-doc-update' into maint | Junio C Hamano | 2017-10-23 | 1 | -2/+4 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'jk/write-in-full-fix' into maint | Junio C Hamano | 2017-10-23 | 22 | -67/+65 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'rj/no-sign-compare' into maint | Junio C Hamano | 2017-10-23 | 10 | -24/+25 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'ma/ts-cleanups' into maint | Junio C Hamano | 2017-10-23 | 6 | -3/+37 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'ls/travis-scriptify' into maint | Junio C Hamano | 2017-10-23 | 10 | -81/+154 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maint | Junio C Hamano | 2017-10-23 | 2 | -3/+145 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'jt/fast-export-copy-modify-fix' into maint | Junio C Hamano | 2017-10-23 | 2 | -15/+51 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'nd/worktree-kill-parse-ref' into maint | Junio C Hamano | 2017-10-23 | 3 | -3/+17 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | Git 2.15-rc2v2.15.0-rc2 | Junio C Hamano | 2017-10-19 | 2 | -1/+13 |