summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2017-11-15merge-recursive: handle addition of submodule on our side of historyLibravatar Elijah Newren2-3/+4
2017-11-12t/3512: demonstrate unrelated submodule/file conflict as cherry-pick failureLibravatar Stefan Beller1-0/+36
2017-10-30Git 2.15Libravatar Junio C Hamano1-1/+1
2017-10-30Merge tag 'l10n-2.15.0-rnd2.1' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano1-58/+123
2017-10-29l10n: Update Catalan translationLibravatar Jordi Mas1-58/+123
2017-10-28Hopefully final batch before 2.15Libravatar Junio C Hamano1-0/+7
2017-10-28Merge branch 'sg/rev-list-doc-reorder-fix'Libravatar Junio C Hamano1-3/+3
2017-10-28Merge branch 'sb/rev-parse-show-superproject-root'Libravatar Junio C Hamano1-1/+1
2017-10-28Merge branch 'ao/path-use-xmalloc'Libravatar Junio C Hamano1-1/+1
2017-10-28Merge branch 'np/config-path-doc'Libravatar Junio C Hamano1-4/+4
2017-10-27docs: fix formatting of rev-parse's --show-superproject-working-treeLibravatar Sebastian Schuberth1-1/+1
2017-10-27rev-list-options.txt: use correct directional referenceLibravatar SZEDER Gábor1-3/+3
2017-10-26Merge branch 'mh/ref-locking-fix'Libravatar Junio C Hamano2-1/+142
2017-10-25path.c: use xmalloc() in add_to_trie()Libravatar Andrey Okoshkin1-1/+1
2017-10-25files_transaction_prepare(): fix handling of ref lock failureLibravatar Michael Haggerty2-9/+9
2017-10-25t1404: add a bunch of tests of D/F conflictsLibravatar Michael Haggerty1-0/+141
2017-10-24Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-poLibravatar Junio C Hamano12-24768/+42782
2017-10-24Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/gitLibravatar Jiang Xin1-2414/+2557
2017-10-24l10n: zh_CN: review for git v2.15.0 l10n round 2Libravatar Ray Chen1-2/+2
2017-10-24l10n: zh_CN: for git v2.15.0 l10n round 2Libravatar Jiang Xin1-2414/+2557
2017-10-24Merge branch 'master' of https://github.com/ralfth/git-po-deLibravatar Jiang Xin1-2448/+2630
2017-10-23l10n: de.po: fix typosLibravatar Andre Hinrichs1-14/+14
2017-10-23l10n: de.po: translate 70 new messagesLibravatar Ralf Thielow1-2435/+2617
2017-10-23Sync with 2.14.3Libravatar Junio C Hamano1-0/+24
2017-10-23Git 2.14.3Libravatar Junio C Hamano2-1/+25
2017-10-23Merge branch 'jk/info-alternates-fix' into maintLibravatar Junio C Hamano1-20/+11
2017-10-23Merge branch 'jc/fetch-refspec-doc-update' into maintLibravatar Junio C Hamano1-2/+4
2017-10-23Merge branch 'jk/write-in-full-fix' into maintLibravatar Junio C Hamano22-67/+65
2017-10-23Merge branch 'rj/no-sign-compare' into maintLibravatar Junio C Hamano10-24/+25
2017-10-23Merge branch 'ma/ts-cleanups' into maintLibravatar Junio C Hamano6-3/+37
2017-10-23Merge branch 'ls/travis-scriptify' into maintLibravatar Junio C Hamano10-81/+154
2017-10-23Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maintLibravatar Junio C Hamano2-3/+145
2017-10-23Merge branch 'jt/fast-export-copy-modify-fix' into maintLibravatar Junio C Hamano2-15/+51
2017-10-23Merge branch 'nd/worktree-kill-parse-ref' into maintLibravatar Junio C Hamano3-3/+17
2017-10-22l10n: ru.po: update Russian translationLibravatar Dimitriy Ryazantcev1-50/+50
2017-10-22Merge branch 'master' of https://github.com/vnwildman/gitLibravatar Jiang Xin1-51/+55
2017-10-19Git 2.15-rc2Libravatar Junio C Hamano2-1/+13
2017-10-19Merge branch 'jc/branch-force-doc-readability-fix'Libravatar Junio C Hamano1-2/+2
2017-10-19Merge branch 'dg/filter-branch-filter-order-doc'Libravatar Junio C Hamano2-16/+16
2017-10-19Merge branch 'jc/fetch-refspec-doc-update'Libravatar Junio C Hamano1-2/+4
2017-10-19Merge branch 'wk/merge-options-gpg-sign-doc'Libravatar Junio C Hamano2-6/+6
2017-10-19config doc: clarify "git config --path" exampleLibravatar Nathan Payre1-4/+4
2017-10-19Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/gitLibravatar Jiang Xin1-2427/+2612
2017-10-19Merge branch 'master' of git://github.com/nafmo/git-l10n-svLibravatar Jiang Xin1-55/+58
2017-10-19Merge branch 'master' of https://github.com/Softcatala/git-poLibravatar Jiang Xin1-3008/+2991
2017-10-19Merge branch 'translation' of https://github.com/ChrisADR/git-poLibravatar Jiang Xin1-50/+54
2017-10-19l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2Libravatar Tran Ngoc Quan1-51/+55
2017-10-18l10n: sv.po: Update Swedish translation (3245t0f0u)Libravatar Peter Krefting1-55/+58
2017-10-18l10n: fr.po: v2.15.0 round 2Libravatar Jean-Noel Avila1-2424/+2612
2017-10-18l10n: fr.po change translation of "First, rewinding"Libravatar Nicolas Cornu1-2/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-29 15:15:32 +0000