summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* l10n: de.po: translate 70 new messagesRalf Thielow2017-10-231-2435/+2617
* l10n: ru.po: update Russian translationDimitriy Ryazantcev2017-10-221-50/+50
* Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2017-10-221-51/+55
|\
| * l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2Tran Ngoc Quan2017-10-191-51/+55
* | Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/gitJiang Xin2017-10-191-2427/+2612
|\ \
| * | l10n: fr.po: v2.15.0 round 2Jean-Noel Avila2017-10-181-2424/+2612
| * | l10n: fr.po change translation of "First, rewinding"Nicolas Cornu2017-10-181-2/+1
| * | l10n: fr.po fix some mistakesJean-Noel Avila2017-10-181-7/+5
| |/
* | Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin2017-10-191-55/+58
|\ \
| * | l10n: sv.po: Update Swedish translation (3245t0f0u)Peter Krefting2017-10-181-55/+58
| |/
* | Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin2017-10-191-3008/+2991
|\ \
| * | l10n: Update Catalan translationJordi Mas2017-10-171-3008/+2991
| |/
* | Merge branch 'translation' of https://github.com/ChrisADR/git-poJiang Xin2017-10-191-50/+54
|\ \
| * | l10n: es.po: v2.15.0 round 2Christopher Díaz Riveros2017-10-171-50/+54
| |/
* / l10n: ko.po: Update Korean translationChangwoo Ryu2017-10-171-2411/+2535
|/
* l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)Jiang Xin2017-10-171-47/+48
* Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin2017-10-177-12060/+29445
|\
| * l10n: ru.po: update Russian translationDimitriy Ryazantcev2017-10-151-2381/+2521
| * Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin2017-10-141-2419/+2554
| |\
| | * l10n: bg.po: Updated Bulgarian translation (3245t)Alexander Shopov2017-10-141-2419/+2554
| * | l10n: sv.po: Update Swedish translation (3245t0f0u)Peter Krefting2017-10-111-2475/+2674
| |/
| * Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin2017-10-111-2425/+2598
| |\
| | * l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0Tran Ngoc Quan2017-10-091-2425/+2598
| * | l10n: es.po: Update translation v2.15.0 round 1Christopher Díaz2017-10-081-2732/+3574
| |/
| * Merge branch 'maint' of git://github.com/git-l10n/git-poJiang Xin2017-10-082-0/+15757
| |\
| | * l10n: es.po: spanish added to TEAMSChristopher Díaz2017-08-271-0/+4
| | * l10n: es.po: initial Spanish version git 2.14.0Christopher Díaz2017-08-271-0/+15753
| * | l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)Jiang Xin2017-10-081-2360/+2499
* | | Git 2.15-rc1v2.15.0-rc1Junio C Hamano2017-10-112-1/+18
* | | Merge branch 'ls/filter-process-delayed'Junio C Hamano2017-10-111-36/+52
|\ \ \
| * | | write_entry: untangle symlink and regular-file casesJeff King2017-10-101-31/+40
| * | | write_entry: avoid reading blobs in CE_RETRY caseJeff King2017-10-101-11/+14
| * | | write_entry: fix leak when retrying delayed filterJeff King2017-10-101-0/+1
| * | | entry.c: check if file exists after checkoutLars Schneider2017-10-061-1/+3
| * | | entry.c: update cache entry only for existing filesLars Schneider2017-10-051-1/+2
* | | | Merge branch 'ds/avoid-overflow-in-midpoint-computation'Junio C Hamano2017-10-1112-15/+15
|\ \ \ \
| * | | | cleanup: fix possible overflow errors in binary searchDerrick Stolee2017-10-1012-15/+15
* | | | | Merge branch 'tb/complete-describe'Junio C Hamano2017-10-111-1/+1
|\ \ \ \ \
| * | | | | completion: add --broken and --dirty to describeThomas Braun2017-10-071-1/+1
* | | | | | Merge branch 'sb/test-cmp-expect-actual'Junio C Hamano2017-10-1114-41/+41
|\ \ \ \ \ \
| * | | | | | tests: fix diff order arguments in test_cmpStefan Beller2017-10-0715-42/+42
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'jk/refs-df-conflict'Junio C Hamano2017-10-114-3/+50
|\ \ \ \ \ \
| * | | | | | refs_resolve_ref_unsafe: handle d/f conflicts for writesJeff King2017-10-073-2/+49
| * | | | | | t3308: create a real ref directory/file conflictJeff King2017-10-071-1/+1
| |/ / / / /
* | | | | | Merge branch 'rs/rs-mailmap'Junio C Hamano2017-10-111-0/+1
|\ \ \ \ \ \
| * | | | | | .mailmap: normalize name for René ScharfeRené Scharfe2017-10-061-0/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs/fsck-null-return-from-lookup'Junio C Hamano2017-10-112-4/+26
|\ \ \ \ \ \
| * | | | | | fsck: handle NULL return of lookup_blob() and lookup_tree()René Scharfe2017-10-062-4/+26
| |/ / / / /
* | | | | | Merge branch 'jk/sha1-loose-object-info-fix'Junio C Hamano2017-10-111-2/+6
|\ \ \ \ \ \
| * | | | | | sha1_loose_object_info: handle errors from unpack_sha1_restJeff King2017-10-061-2/+6
| |/ / / / /