summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-10-30Git 2.15v2.15.0Junio C Hamano1-1/+1
2017-10-30Merge tag 'l10n-2.15.0-rnd2.1' of git://github.com/git-l10n/git-poJunio C Hamano1-58/+123
2017-10-29l10n: Update Catalan translationJordi Mas1-58/+123
2017-10-28Hopefully final batch before 2.15Junio C Hamano1-0/+7
2017-10-28Merge branch 'sg/rev-list-doc-reorder-fix'Junio C Hamano1-3/+3
2017-10-28Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano1-1/+1
2017-10-28Merge branch 'ao/path-use-xmalloc'Junio C Hamano1-1/+1
2017-10-28Merge branch 'np/config-path-doc'Junio C Hamano1-4/+4
2017-10-27docs: fix formatting of rev-parse's --show-superproject-working-treeSebastian Schuberth1-1/+1
2017-10-27rev-list-options.txt: use correct directional referenceSZEDER Gábor1-3/+3
2017-10-26Merge branch 'mh/ref-locking-fix'Junio C Hamano2-1/+142
2017-10-25path.c: use xmalloc() in add_to_trie()Andrey Okoshkin1-1/+1
2017-10-25files_transaction_prepare(): fix handling of ref lock failureMichael Haggerty2-9/+9
2017-10-25t1404: add a bunch of tests of D/F conflictsMichael Haggerty1-0/+141
2017-10-24Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano12-24768/+42782
2017-10-24Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/gitJiang Xin1-2414/+2557
2017-10-24l10n: zh_CN: review for git v2.15.0 l10n round 2Ray Chen1-2/+2
2017-10-24l10n: zh_CN: for git v2.15.0 l10n round 2Jiang Xin1-2414/+2557
2017-10-24Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin1-2448/+2630
2017-10-23l10n: de.po: fix typosAndre Hinrichs1-14/+14
2017-10-23l10n: de.po: translate 70 new messagesRalf Thielow1-2435/+2617
2017-10-23Sync with 2.14.3Junio C Hamano1-0/+24
2017-10-23Git 2.14.3v2.14.3Junio C Hamano2-1/+25
2017-10-23Merge branch 'jk/info-alternates-fix' into maintJunio C Hamano1-20/+11
2017-10-23Merge branch 'jc/fetch-refspec-doc-update' into maintJunio C Hamano1-2/+4
2017-10-23Merge branch 'jk/write-in-full-fix' into maintJunio C Hamano22-67/+65
2017-10-23Merge branch 'rj/no-sign-compare' into maintJunio C Hamano10-24/+25
2017-10-23Merge branch 'ma/ts-cleanups' into maintJunio C Hamano6-3/+37
2017-10-23Merge branch 'ls/travis-scriptify' into maintJunio C Hamano10-81/+154
2017-10-23Merge branch 'er/fast-import-dump-refs-on-checkpoint' into maintJunio C Hamano2-3/+145
2017-10-23Merge branch 'jt/fast-export-copy-modify-fix' into maintJunio C Hamano2-15/+51
2017-10-23Merge branch 'nd/worktree-kill-parse-ref' into maintJunio C Hamano3-3/+17
2017-10-22l10n: ru.po: update Russian translationDimitriy Ryazantcev1-50/+50
2017-10-22Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-51/+55
2017-10-19Git 2.15-rc2v2.15.0-rc2Junio C Hamano2-1/+13
2017-10-19Merge branch 'jc/branch-force-doc-readability-fix'Junio C Hamano1-2/+2
2017-10-19Merge branch 'dg/filter-branch-filter-order-doc'Junio C Hamano2-16/+16
2017-10-19Merge branch 'jc/fetch-refspec-doc-update'Junio C Hamano1-2/+4
2017-10-19Merge branch 'wk/merge-options-gpg-sign-doc'Junio C Hamano2-6/+6
2017-10-19config doc: clarify "git config --path" exampleNathan Payre1-4/+4
2017-10-19Merge branch 'l10n_fr_v2.15.0r2' of git://github.com/jnavila/gitJiang Xin1-2427/+2612
2017-10-19Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-55/+58
2017-10-19Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin1-3008/+2991
2017-10-19Merge branch 'translation' of https://github.com/ChrisADR/git-poJiang Xin1-50/+54
2017-10-19l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0 round 2Tran Ngoc Quan1-51/+55
2017-10-18l10n: sv.po: Update Swedish translation (3245t0f0u)Peter Krefting1-55/+58
2017-10-18l10n: fr.po: v2.15.0 round 2Jean-Noel Avila1-2424/+2612
2017-10-18l10n: fr.po change translation of "First, rewinding"Nicolas Cornu1-2/+1
2017-10-18l10n: fr.po fix some mistakesJean-Noel Avila1-7/+5
2017-10-18Sync with maintJunio C Hamano2-46/+75
2017-10-18Prepare for 2.14.3Junio C Hamano2-1/+76
2017-10-18Merge branch 'jk/ref-filter-colors-fix' into maintJunio C Hamano23-71/+103
2017-10-18Merge branch 'jc/doc-checkout' into maintJunio C Hamano1-14/+16
2017-10-18Merge branch 'tb/complete-describe' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'rs/rs-mailmap' into maintJunio C Hamano1-0/+1
2017-10-18Merge branch 'rs/fsck-null-return-from-lookup' into maintJunio C Hamano2-4/+26
2017-10-18Merge branch 'jk/sha1-loose-object-info-fix' into maintJunio C Hamano1-2/+6
2017-10-18Merge branch 'sb/branch-avoid-repeated-strbuf-release' into maintJunio C Hamano1-2/+3
2017-10-18Merge branch 'rs/qsort-s' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'jn/strbuf-doc-re-reuse' into maintJunio C Hamano1-2/+9
2017-10-18Merge branch 'rs/run-command-use-alloc-array' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'rs/tag-null-pointer-arith-fix' into maintJunio C Hamano1-4/+4
2017-10-18Merge branch 'rs/cocci-de-paren-call-params' into maintJunio C Hamano1-5/+5
2017-10-18Merge branch 'ad/doc-markup-fix' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'mr/doc-negative-pathspec' into maintJunio C Hamano5-2/+24
2017-10-18Merge branch 'jk/validate-headref-fix' into maintJunio C Hamano1-11/+12
2017-10-18Merge branch 'ks/doc-use-camelcase-for-config-name' into maintJunio C Hamano2-3/+3
2017-10-18Merge branch 'jk/doc-read-tree-table-asciidoctor-fix' into maintJunio C Hamano1-0/+2
2017-10-18Merge branch 'hn/typofix' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'ks/test-readme-phrasofix' into maintJunio C Hamano1-3/+3
2017-10-18Merge branch 'ez/doc-duplicated-words-fix' into maintJunio C Hamano4-4/+4
2017-10-18Merge branch 'kd/doc-for-each-ref' into maintJunio C Hamano1-16/+17
2017-10-18Merge branch 'cc/subprocess-handshake-missing-capabilities' into maintJunio C Hamano1-2/+2
2017-10-18Merge branch 'jk/system-path-cleanup' into maintJunio C Hamano1-14/+28
2017-10-18Merge branch 'bb/doc-eol-dirty' into maintJunio C Hamano1-1/+4
2017-10-18Merge branch 'mg/timestamp-t-fix' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'ma/pkt-line-leakfix' into maintJunio C Hamano1-1/+2
2017-10-18Merge branch 'jk/config-lockfile-leak-fix' into maintJunio C Hamano1-17/+7
2017-10-18Merge branch 'dw/diff-highlight-makefile-fix' into maintJunio C Hamano1-0/+3
2017-10-18Merge branch 'jk/drop-sha1-entry-pos' into maintJunio C Hamano5-244/+1
2017-10-18Merge branch 'tb/ref-filter-empty-modifier' into maintJunio C Hamano2-1/+10
2017-10-18Merge branch 'rb/compat-poll-fix' into maintJunio C Hamano1-0/+4
2017-10-18Merge branch 'tg/memfixes' into maintJunio C Hamano3-8/+6
2017-10-18Merge branch 'ar/request-pull-phrasofix' into maintJunio C Hamano2-3/+3
2017-10-18Merge branch 'jc/merge-x-theirs-docfix' into maintJunio C Hamano1-1/+2
2017-10-18Merge branch 'rs/mailinfo-qp-decode-fix' into maintJunio C Hamano1-3/+8
2017-10-18Merge branch 'ik/userdiff-html-h-element-fix' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'jk/diff-blob' into maintJunio C Hamano2-2/+7
2017-10-18Merge branch 'jk/describe-omit-some-refs' into maintJunio C Hamano2-4/+11
2017-10-18Merge branch 'mh/for-each-string-list-item-empty-fix' into maintJunio C Hamano1-2/+4
2017-10-18Merge branch 'tb/test-lint-echo-e' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'aw/gc-lockfile-fscanf-fix' into maintJunio C Hamano1-1/+1
2017-10-18Merge branch 'tg/refs-allowed-flags' into maintJunio C Hamano2-0/+10
2017-10-18Merge branch 'rs/archive-excluded-directory' into maintJunio C Hamano4-21/+6
2017-10-18Merge branch 'rk/commit-tree-make-F-verbatim' into maintJunio C Hamano1-1/+0
2017-10-18Merge branch 'mh/packed-ref-store-prep' into maintJunio C Hamano2-4/+18
2017-10-18Merge branch 'mm/send-email-cc-cruft' into maintJunio C Hamano2-8/+29
2017-10-18Merge branch 'rs/strbuf-getwholeline-fix' into maintJunio C Hamano1-0/+1
2017-10-18branch doc: sprinkle a few commas for readabilityJunio C Hamano1-2/+2
2017-10-18Preparing for rc2 continuesJunio C Hamano1-3/+2
2017-10-18Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano12-32/+62
2017-10-18Merge branch 'js/rebase-i-final'Junio C Hamano1-1/+1
2017-10-18doc: list filter-branch subdirectory-filter firstDavid Glasser2-20/+20
2017-10-18sequencer.c: unify an error messageRalf Thielow1-1/+1
2017-10-18fetch doc: src side of refspec could be full SHA-1Junio C Hamano1-2/+4
2017-10-17l10n: Update Catalan translationJordi Mas1-3008/+2991
2017-10-17l10n: ko.po: Update Korean translationChangwoo Ryu1-2411/+2535
2017-10-17tag: respect color.ui configJeff King3-1/+12
2017-10-17Revert "color: check color.ui in git_default_config()"Jeff King8-9/+17
2017-10-17Revert "t6006: drop "always" color config tests"Jeff King1-5/+15
2017-10-17Revert "color: make "always" the same as "auto" in config"Jeff King3-19/+20
2017-10-17Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano18-98/+100
2017-10-17Crawling towards -rc2Junio C Hamano1-0/+1
2017-10-17Merge branch 'sb/diff-color-move'Junio C Hamano2-13/+24
2017-10-17Merge branch 'js/rebase-i-final'Junio C Hamano1-2/+2
2017-10-17Merge branch 'jc/doc-checkout'Junio C Hamano1-14/+16
2017-10-16l10n: es.po: v2.15.0 round 2Christopher Díaz Riveros1-50/+54
2017-10-17l10n: git.pot: v2.15.0 round 2 (2 new, 2 removed)Jiang Xin1-47/+48
2017-10-17Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin7-12060/+29445
2017-10-16diff: fix infinite loop with --color-moved --ignore-space-changeJeff King2-13/+24
2017-10-16sequencer.c: fix and unify error messages in rearrange_squash()Ralf Thielow1-2/+2
2017-10-15l10n: ru.po: update Russian translationDimitriy Ryazantcev1-2381/+2521
2017-10-14Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin1-2419/+2554
2017-10-14l10n: bg.po: Updated Bulgarian translation (3245t)Alexander Shopov1-2419/+2554
2017-10-12Documentation/merge-options.txt: describe -S/--gpg-sign for 'pull'W. Trevor King2-6/+6
2017-10-11l10n: sv.po: Update Swedish translation (3245t0f0u)Peter Krefting1-2475/+2674
2017-10-11checkout doc: clarify command line args for "checkout paths" modeJunio C Hamano1-14/+16
2017-10-11Git 2.15-rc1v2.15.0-rc1Junio C Hamano2-1/+18
2017-10-11Merge branch 'ls/filter-process-delayed'Junio C Hamano1-36/+52
2017-10-11Merge branch 'ds/avoid-overflow-in-midpoint-computation'Junio C Hamano12-15/+15
2017-10-11Merge branch 'tb/complete-describe'Junio C Hamano1-1/+1
2017-10-11Merge branch 'sb/test-cmp-expect-actual'Junio C Hamano14-41/+41
2017-10-11Merge branch 'jk/refs-df-conflict'Junio C Hamano4-3/+50
2017-10-11Merge branch 'rs/rs-mailmap'Junio C Hamano1-0/+1
2017-10-11Merge branch 'rs/fsck-null-return-from-lookup'Junio C Hamano2-4/+26
2017-10-11Merge branch 'jk/sha1-loose-object-info-fix'Junio C Hamano1-2/+6
2017-10-11Merge branch 'hn/string-list-doc'Junio C Hamano1-1/+1
2017-10-11Merge branch 'tb/show-trailers-in-ref-filter'Junio C Hamano4-17/+122
2017-10-11Merge branch 'jt/oidmap'Junio C Hamano6-31/+133
2017-10-11Merge branch 'jr/hash-migration-plan-doc'Junio C Hamano2-0/+798
2017-10-11Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-2425/+2598
2017-10-10write_entry: untangle symlink and regular-file casesJeff King1-31/+40
2017-10-10write_entry: avoid reading blobs in CE_RETRY caseJeff King1-11/+14
2017-10-10write_entry: fix leak when retrying delayed filterJeff King1-0/+1
2017-10-10cleanup: fix possible overflow errors in binary searchDerrick Stolee12-15/+15
2017-10-09Merge branch 'js/rebase-i-final'Junio C Hamano1-1/+1
2017-10-09i18n: add a missing space in messageJean-Noel Avila1-1/+1
2017-10-09l10n: vi.po(3245t): Updated Vietnamese translation for v2.15.0Tran Ngoc Quan1-2425/+2598
2017-10-08l10n: es.po: Update translation v2.15.0 round 1Christopher Díaz1-2732/+3574
2017-10-08Merge branch 'maint' of git://github.com/git-l10n/git-poJiang Xin2-0/+15757
2017-10-08l10n: git.pot: v2.15.0 round 1 (68 new, 36 removed)Jiang Xin1-2360/+2499
2017-10-07Prepare for -rc1Junio C Hamano1-3/+38
2017-10-07Merge branch 'tb/ref-filter-empty-modifier'Junio C Hamano2-1/+10
2017-10-07Merge branch 'ks/verify-filename-non-option-error-message-tweak'Junio C Hamano1-1/+1
2017-10-07Merge branch 'ks/branch-tweak-error-message-for-extra-args'Junio C Hamano1-3/+3
2017-10-07Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano19-113/+115
2017-10-07Merge branch 'ma/builtin-unleak'Junio C Hamano5-4/+11
2017-10-07Merge branch 'rb/compat-poll-fix'Junio C Hamano1-0/+4
2017-10-07Merge branch 'tg/memfixes'Junio C Hamano3-8/+6
2017-10-07Merge branch 'sb/branch-avoid-repeated-strbuf-release'Junio C Hamano1-2/+3
2017-10-07Merge branch 'rs/qsort-s'Junio C Hamano1-1/+1
2017-10-07Merge branch 'jn/strbuf-doc-re-reuse'Junio C Hamano1-2/+9
2017-10-07Merge branch 'tb/delimit-pretty-trailers-args-with-comma'Junio C Hamano2-7/+30
2017-10-07completion: add --broken and --dirty to describeThomas Braun1-1/+1
2017-10-07tests: fix diff order arguments in test_cmpStefan Beller15-42/+42
2017-10-07refs_resolve_ref_unsafe: handle d/f conflicts for writesJeff King3-2/+49
2017-10-07t3308: create a real ref directory/file conflictJeff King1-1/+1
2017-10-06api-argv-array.txt: remove broken link to string-list APITodd Zullinger1-1/+1
2017-10-06entry.c: check if file exists after checkoutLars Schneider1-1/+3
2017-10-06sha1_loose_object_info: handle errors from unpack_sha1_restJeff King1-2/+6
2017-10-06.mailmap: normalize name for René ScharfeRené Scharfe1-0/+1
2017-10-06fsck: handle NULL return of lookup_blob() and lookup_tree()René Scharfe2-4/+26
2017-10-05entry.c: update cache entry only for existing filesLars Schneider1-1/+2
2017-10-05Git 2.15-rc0v2.15.0-rc0Junio C Hamano2-1/+17
2017-10-05Merge branch 'ar/request-pull-phrasofix'Junio C Hamano2-3/+3
2017-10-05Merge branch 'rs/run-command-use-alloc-array'Junio C Hamano1-1/+1
2017-10-05Merge branch 'sb/git-clang-format'Junio C Hamano1-1/+5
2017-10-05Merge branch 'rs/use-free-and-null'Junio C Hamano1-18/+9
2017-10-05Merge branch 'rs/tag-null-pointer-arith-fix'Junio C Hamano1-4/+4
2017-10-05Merge branch 'rs/cocci-de-paren-call-params'Junio C Hamano1-5/+5
2017-10-05Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano5-12/+8
2017-10-05Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano7-20/+9
2017-10-05Merge branch 'er/fast-import-dump-refs-on-checkpoint'Junio C Hamano2-3/+145
2017-10-05ref-filter.c: pass empty-string as NULL to atom parsersTaylor Blau2-1/+10
2017-10-04strbuf doc: reuse after strbuf_release is fineJonathan Nieder1-2/+9
2017-10-04branch: reset instead of release a strbufStefan Beller1-2/+3
2017-10-04sub-process: use child_process.args instead of child_process.argvJohannes Sixt1-2/+1
2017-10-04http-push: fix construction of hex value from pathThomas Gummerer1-1/+1
2017-10-04path.c: fix uninitialized memory accessJeff King1-5/+4
2017-10-04test-stringlist: avoid buffer underrun when sorting nothingRené Scharfe1-1/+1
2017-10-04setup: update error message to be more meaningfulKaartic Sivaraam1-1/+1
2017-10-04branch: change the error messages to be more meaningfulKaartic Sivaraam1-3/+3
2017-10-04Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoJunio C Hamano19-99/+101
2017-10-04t7301: use test_terminal to check colorJeff King1-2/+3
2017-10-04t4015: use --color with --color-movedJeff King1-13/+12
2017-10-04color: make "always" the same as "auto" in configJeff King3-19/+28
2017-10-04provide --color option for all ref-filter usersJeff King6-4/+16
2017-10-04t3205: use --color instead of color.branch=alwaysJeff King1-3/+2
2017-10-04t3203: drop "always" color testJeff King1-6/+0
2017-10-04t6006: drop "always" color config testsJeff King1-15/+5
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-18 16:47:36 +0000