summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2017-08-04Git 2.14v2.14.0Junio C Hamano2-13/+3
2017-08-04Merge branch 'ah/patch-id-doc'Junio C Hamano1-3/+0
2017-08-04Merge branch 'as/diff-options-grammofix'Junio C Hamano1-1/+1
2017-08-02Merge tag 'l10n-2.14.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano9-15801/+17022
2017-08-02l10n: zh_CN: review for git v2.14.0 l10nJiang Xin2-8/+10
2017-08-01Sync with v2.13.4Junio C Hamano0-0/+0
2017-08-01Git 2.13.4v2.13.4Junio C Hamano1-1/+1
2017-08-01l10n: ko.po: Update Korean translationChangwoo Ryu1-13/+56
2017-08-01l10n: zh_CN: for git v2.14.0 l10n round 2Jiang Xin1-3165/+3147
2017-07-31Sync with maintJunio C Hamano1-0/+18
2017-07-31Preparation for 2.13.4 continuesJunio C Hamano1-0/+18
2017-07-31Merge branch 'ks/doc-fixes' into maintJunio C Hamano2-10/+11
2017-07-31Merge branch 'jk/test-copy-bytes-fix' into maintJunio C Hamano1-0/+1
2017-07-31Merge branch 'pw/unquote-path-in-git-pm' into maintJunio C Hamano3-43/+61
2017-07-31Merge branch 'jk/gc-pre-detach-under-hook' into maintJunio C Hamano2-0/+25
2017-07-31Merge branch 'jn/hooks-pre-rebase-sample-fix' into maintJunio C Hamano1-3/+3
2017-07-31Merge branch 'rs/progress-overall-throughput-at-the-end' into maintJunio C Hamano1-2/+6
2017-07-31Merge branch 'tb/push-to-cygwin-unc-path' into maintJunio C Hamano5-0/+27
2017-07-31Merge branch 'rs/apply-avoid-over-reading' into maintJunio C Hamano1-4/+2
2017-07-31Merge branch 'js/blame-lib'Junio C Hamano1-2/+4
2017-07-31diff-options doc: grammar fixAnthony Sottile1-1/+1
2017-07-30l10n: de.po: various fixes in German translationHartmut Henkel1-27/+25
2017-07-30Merge branch 'russian-l10n' of https://github.com/DJm00n/git-po-ruJiang Xin1-3027/+3137
2017-07-30l10n: ru.po: update Russian translationDimitriy Ryazantcev1-3027/+3137
2017-07-28doc: remove unsupported parameter from patch-idAndreas Heiduk1-3/+0
2017-07-27Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin1-3010/+3181
2017-07-27Merge branch 'fr_l10n_v2.14.0rnd2' of git://github.com/jnavila/gitJiang Xin1-3038/+3222
2017-07-27l10n: fr.po v2.14.0 rnd 2Jean-Noel Avila1-3009/+3193
2017-07-27l10n: fr.po Fix some french typosSylvestre Ledru1-17/+17
2017-07-27l10n: fr.po Fix typoLouis1-1/+1
2017-07-27l10n: fr.po Fix some translationsHugues Peccatte1-13/+13
2017-07-26l10n: de.po: update German translationRalf Thielow1-3010/+3181
2017-07-26Merge branch 'master' of https://github.com/Softcatala/git-poJiang Xin1-3453/+4119
2017-07-26Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin1-17/+67
2017-07-25l10n: vi.po (3213t): Updated 9 new stringsTran Ngoc Quan1-50/+65
2017-07-24Git 2.14-rc1v2.14.0-rc1Junio C Hamano1-1/+1
2017-07-24blame: fix memory corruption scrambling revision name in error messageSZEDER Gábor1-2/+4
2017-07-24Merge https://github.com/git-l10n/git-poJunio C Hamano7-18800/+20664
2017-07-24l10n: Update Catalan translationJordi Mas1-3453/+4119
2017-07-24l10n: bg.po: Updated Bulgarian translation (3213t)Alexander Shopov1-17/+67
2017-07-24l10n: git.pot: v2.14.0 round 2 (9 new, 2 removed)Jiang Xin1-10/+60
2017-07-24Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin7-18830/+20644
2017-07-22Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-3103/+3271
2017-07-21Sync with maintJunio C Hamano1-0/+10
2017-07-21fixes from 'master' for 2.13.4Junio C Hamano2-1/+11
2017-07-21Merge branch 'ew/fd-cloexec-fix' into maintJunio C Hamano1-3/+3
2017-07-21Merge branch 'ks/fix-rebase-doc-picture' into maintJunio C Hamano1-1/+1
2017-07-21Merge branch 'js/alias-case-sensitivity' into maintJunio C Hamano2-1/+8
2017-07-21Merge branch 'bb/unicode-10.0' into maintJunio C Hamano1-13/+29
2017-07-21Hopefully the final last-minute fix before -rc1Junio C Hamano1-1/+11
2017-07-21Merge branch 'ks/doc-fixes'Junio C Hamano2-10/+11
2017-07-21Merge branch 'rj/cygwin-fread-reads-directories'Junio C Hamano1-0/+1
2017-07-21Merge branch 'jc/po-pritime-fix'Junio C Hamano1-0/+21
2017-07-21config.mak.uname: set FREAD_READS_DIRECTORIES for cygwinRamsay Jones1-0/+1
2017-07-20A few more topics while waiting for the po/PRItime resolutionJunio C Hamano1-0/+12
2017-07-20Merge branch 'mt/p4-parse-G-output'Junio C Hamano2-31/+166
2017-07-20Merge branch 'ew/fd-cloexec-fix'Junio C Hamano1-3/+3
2017-07-20Merge branch 'jk/build-with-asan'Junio C Hamano1-1/+6
2017-07-20Merge branch 'jk/test-copy-bytes-fix'Junio C Hamano1-0/+1
2017-07-20Merge branch 'js/alias-case-sensitivity'Junio C Hamano2-1/+8
2017-07-20l10n: sv.po: Update Swedish translation (3206t0f0u)Peter Krefting1-3103/+3271
2017-07-20RelNotes: mention "sha1dc: optionally use sha1collisiondetection as a submodule"Ævar Arnfjörð Bjarmason1-0/+5
2017-07-20RelNotes: mention "log: make --regexp-ignore-case work with --perl-regexp"Ævar Arnfjörð Bjarmason1-0/+3
2017-07-20RelNotes: mention "log: add -P as a synonym for --perl-regexp"Ævar Arnfjörð Bjarmason1-0/+2
2017-07-20Makefile: help gettext tools to cope with our custom PRItime formatJunio C Hamano1-0/+21
2017-07-19l10n: ko.po: Update Korean translationChangwoo Ryu1-3228/+3585
2017-07-18doc: reformat the paragraph containing the 'cut-line'Kaartic Sivaraam1-5/+6
2017-07-18A few more topics before 2.14-rc1Junio C Hamano1-19/+45
2017-07-18Merge branch 'jk/gc-pre-detach-under-hook'Junio C Hamano2-0/+25
2017-07-18Merge branch 'jn/hooks-pre-rebase-sample-fix'Junio C Hamano1-3/+3
2017-07-18Merge branch 'rs/progress-overall-throughput-at-the-end'Junio C Hamano1-2/+6
2017-07-18Merge branch 'tb/push-to-cygwin-unc-path'Junio C Hamano5-0/+27
2017-07-18l10n: Update Catalan translationJordi Mas1-1071/+602
2017-07-17doc: camelCase the i18n config variables to improve readabilityKaartic Sivaraam1-5/+5
2017-07-17t: handle EOF in test_copy_bytes()Jeff King1-0/+1
2017-07-17set FD_CLOEXEC properly when O_CLOEXEC is not supportedEric Wong1-3/+3
2017-07-17Makefile: allow combining UBSan with other sanitizersRené Scharfe1-1/+6
2017-07-17alias: compare alias name *case-insensitively*Johannes Schindelin2-2/+2
2017-07-17t1300: demonstrate that CamelCased aliases regressedJohannes Schindelin1-0/+7
2017-07-16l10n: bg.po: Updated Bulgarian translation (3206t)Alexander Shopov1-3048/+3111
2017-07-15l10n: vi.po(3206t): Update Vietnamese translationTran Ngoc Quan1-3013/+3180
2017-07-15l10n: git.pot: v2.14.0 round 1 (34 new, 23 removed)Jiang Xin1-2993/+3059
2017-07-15Merge branch 'maint' of git://github.com/git-l10n/git-poJiang Xin2-2378/+3840
2017-07-13Git 2.14-rc0v2.14.0-rc0Junio C Hamano2-5/+13
2017-07-13Merge branch 'jk/build-with-asan'Junio C Hamano2-3/+16
2017-07-13Merge branch 'sb/pull-rebase-submodule'Junio C Hamano8-41/+193
2017-07-13Merge branch 'sb/hashmap-customize-comparison'Junio C Hamano20-409/+431
2017-07-13Merge branch 'ab/grep-lose-opt-regflags'Junio C Hamano4-32/+35
2017-07-13git-p4: filter for {'code':'info'} in p4CmdListMiguel Torroja2-5/+8
2017-07-13git-p4: parse marshal output "p4 -G" in p4 changesMiguel Torroja2-29/+58
2017-07-13git-p4: git-p4 tests with p4 triggersMiguel Torroja1-0/+103
2017-07-12Sync with v2.13.3Junio C Hamano1-0/+9
2017-07-12Git 2.13.3v2.13.3Junio C Hamano2-1/+10
2017-07-12Merge branch 'kn/ref-filter-branch-list' into maintJunio C Hamano3-7/+54
2017-07-12Merge branch 'ks/typofix-commit-c-comment' into maintJunio C Hamano1-1/+1
2017-07-12Merge branch 'jk/reflog-walk-maint' into maintJunio C Hamano3-12/+42
2017-07-12Hopefully the last batch before -rc0Junio C Hamano1-0/+9
2017-07-12Merge branch 'ks/fix-rebase-doc-picture'Junio C Hamano1-1/+1
2017-07-12Merge branch 'rs/wt-status-cleanup'Junio C Hamano1-3/+4
2017-07-12Merge branch 'rs/use-div-round-up'Junio C Hamano9-15/+14
2017-07-12Merge branch 'kn/ref-filter-branch-list'Junio C Hamano3-7/+54
2017-07-12Merge branch 'rs/urlmatch-cleanup'Junio C Hamano1-5/+5
2017-07-12Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano1-2/+1
2017-07-12Merge branch 'sb/submodule-doc'Junio C Hamano4-36/+234
2017-07-12gc: run pre-detach operations under lockJeff King2-0/+25
2017-07-11pre-rebase hook: capture documentation in a <<here documentJonathan Nieder1-3/+3
2017-07-10use DIV_ROUND_UPRené Scharfe9-15/+14
2017-07-10Sync with maintJunio C Hamano3-21/+54
2017-07-10Prepare for 2.13.3Junio C Hamano2-1/+54
2017-07-10Merge branch 'sb/merge-recursive-code-cleanup' into maintJunio C Hamano1-3/+3
2017-07-10Merge branch 'jc/utf8-fprintf' into maintJunio C Hamano1-3/+2
2017-07-10Merge branch 'js/fsck-name-object' into maintJunio C Hamano1-1/+1
2017-07-10Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix' into maintJunio C Hamano1-4/+10
2017-07-10Merge branch 'ab/sha1dc-maint' into maintJunio C Hamano1-22/+66
2017-07-10Merge branch 'aw/contrib-subtree-doc-asciidoctor' into maintJunio C Hamano1-7/+19
2017-07-10Merge branch 'cc/shared-index-permfix' into maintJunio C Hamano4-11/+50
2017-07-10Merge branch 'ah/doc-pretty-color-auto-prefix' into maintJunio C Hamano1-5/+6
2017-07-10Merge branch 'mb/reword-autocomplete-message' into maintJunio C Hamano1-6/+12
2017-07-10Merge branch 'ks/t7508-indent-fix' into maintJunio C Hamano1-1/+1
2017-07-10Merge branch 'sb/t4005-modernize' into maintJunio C Hamano1-52/+43
2017-07-10Merge branch 'rs/apply-validate-input' into maintJunio C Hamano4-7/+86
2017-07-10Merge branch 'jc/pack-bitmap-unaligned' into maintJunio C Hamano1-1/+1
2017-07-10Merge branch 'pw/rebase-i-regression-fix-tests' into maintJunio C Hamano4-12/+148
2017-07-10Merge branch 'jk/add-p-commentchar-fix' into maintJunio C Hamano2-1/+10
2017-07-10Merge branch 'js/alias-early-config' into maintJunio C Hamano8-61/+49
2017-07-10Merge branch 'rs/pretty-add-again' into maintJunio C Hamano3-45/+0
2017-07-10Merge branch 'ah/doc-gitattributes-empty-index' into maintJunio C Hamano1-1/+1
2017-07-10Merge branch 'da/mergetools-meld-output-opt-on-macos' into maintJunio C Hamano1-1/+1
2017-07-10Merge branch 'jk/diff-highlight-module' into maintJunio C Hamano5-19/+82
2017-07-10Sixteenth batch for 2.14Junio C Hamano1-0/+14
2017-07-10Merge branch 'jk/reflog-walk-maint'Junio C Hamano3-12/+42
2017-07-10Merge branch 'bb/unicode-10.0'Junio C Hamano1-13/+29
2017-07-10Merge branch 'ks/typofix-commit-c-comment'Junio C Hamano1-1/+1
2017-07-10Merge branch 'ab/wildmatch'Junio C Hamano16-29/+22
2017-07-10Merge branch 'ab/sha1dc'Junio C Hamano4-0/+24
2017-07-10Merge branch 'rs/free-and-null'Junio C Hamano1-9/+1
2017-07-10Merge branch 'pw/unquote-path-in-git-pm'Junio C Hamano3-43/+61
2017-07-10Merge branch 'ks/commit-assuming-only-warning-removal'Junio C Hamano2-8/+24
2017-07-10ref-filter.c: drop return from void functionAlejandro R. Sedeño1-1/+1
2017-07-10l10n: de.po: fix typoRalf Thielow1-1/+1
2017-07-10Makefile: disable unaligned loads with UBSanJeff King1-0/+3
2017-07-10Makefile: turn off -fomit-frame-pointer with sanitizersJeff King1-0/+1
2017-07-10Makefile: add helper for compiling with -fsanitizeJeff King1-0/+4
2017-07-10test-lib: turn on ASan abort_on_error by defaultJeff King1-1/+1
2017-07-10test-lib: set ASAN_OPTIONS variable before we run gitJeff King1-3/+8
2017-07-10doc: correct a mistake in an illustrationKaartic Sivaraam1-1/+1
2017-07-10wt-status: use separate variable for result of shorten_unambiguous_refRené Scharfe1-3/+4
2017-07-09progress: show overall rate in last updateRené Scharfe1-2/+6
2017-07-09urlmatch: use hex2chr() in append_normalized_escapes()René Scharfe1-5/+5
2017-07-09apply: use strcmp(3) for comparing strings in gitdiff_verify_name()René Scharfe1-2/+1
2017-07-09branch: set remote color in ref-filter branch immediatelyJeff King1-5/+6
2017-07-09branch: use BRANCH_COLOR_LOCAL in ref-filter formatJeff King2-2/+47
2017-07-09branch: only perform HEAD check for local branchesJeff King1-1/+2
2017-07-07unicode: update the width tables to Unicode 10Beat Bolli1-13/+29
2017-07-07reflog-walk: include all fields when freeing complete_reflogsJeff King1-8/+18
2017-07-07reflog-walk: don't free reflogs added to cacheJeff King2-4/+4
2017-07-07reflog-walk: duplicate strings in complete_reflogs listJeff King2-0/+7
2017-07-06Fifteenth batch for 2.14Junio C Hamano1-0/+24
2017-07-06Merge branch 'ab/strbuf-addftime-tzname-boolify'Junio C Hamano3-6/+6
2017-07-06Merge branch 'xz/send-email-batch-size'Junio C Hamano4-0/+45
2017-07-06Merge branch 'js/t5534-rev-parse-gives-multi-line-output-fix'Junio C Hamano1-4/+10
2017-07-06Merge branch 'sb/merge-recursive-code-cleanup'Junio C Hamano1-3/+3
2017-07-06Merge branch 'rs/apply-avoid-over-reading'Junio C Hamano1-2/+1
2017-07-06Merge branch 'ab/sha1dc-maint'Junio C Hamano1-22/+66
2017-07-06Merge branch 'jc/utf8-fprintf'Junio C Hamano1-3/+2
2017-07-06Merge branch 'js/fsck-name-object'Junio C Hamano1-1/+1
2017-07-06Merge branch 'aw/contrib-subtree-doc-asciidoctor'Junio C Hamano1-7/+19
2017-07-06builtin/commit.c: fix a typo in the commentKaartic Sivaraam1-1/+1
2017-07-05cygwin: allow pushing to UNC pathsTorsten Bögershausen5-0/+27
2017-07-05Fourteenth batch for 2.14Junio C Hamano1-0/+12
2017-07-05Merge branch 'jt/unify-object-info'Junio C Hamano5-217/+224
2017-07-05Merge branch 'cc/shared-index-permfix'Junio C Hamano4-11/+50
2017-07-05Merge branch 'rs/sha1-name-readdir-optim'Junio C Hamano7-39/+90
2017-07-05Merge branch 'bw/repo-object'Junio C Hamano20-373/+972
2017-07-05reflog-walk: skip over double-null oid due to HEAD renameJeff King2-0/+13
2017-07-05t5534: fix misleading grep invocationJohannes Schindelin1-4/+10
2017-07-05send-email: --batch-size to work around some SMTP server limitxiaoqiang zhao4-0/+45
2017-07-03sha1collisiondetection: automatically enable when submodule is populatedJunio C Hamano1-0/+4
2017-07-03sha1dc: optionally use sha1collisiondetection as a submoduleÆvar Arnfjörð Bjarmason4-0/+20
2017-07-03sha1dc: update from upstreamÆvar Arnfjörð Bjarmason1-22/+66
2017-07-01strbuf: change an always NULL/"" strbuf_addftime() param to boolÆvar Arnfjörð Bjarmason3-6/+6
2017-07-01apply: use starts_with() in gitdiff_verify_name()René Scharfe1-2/+1
2017-06-30Thirteenth batch for 2.14Junio C Hamano1-0/+23
2017-06-30Merge branch 'vs/typofixes'Junio C Hamano28-41/+41
2017-06-30Merge branch 'rs/apply-validate-input'Junio C Hamano4-7/+86
2017-06-30Merge branch 'jc/pack-bitmap-unaligned'Junio C Hamano1-1/+1
2017-06-30Merge branch 'ah/doc-pretty-color-auto-prefix'Junio C Hamano1-5/+6
2017-06-30Merge branch 'ks/submodule-add-doc'Junio C Hamano1-28/+21
2017-06-30Merge branch 'ks/status-initial-commit'Junio C Hamano5-3/+38
2017-06-30Merge branch 'ab/die-errors-in-threaded'Junio C Hamano1-1/+17
2017-06-30Merge branch 'pw/rebase-i-regression-fix-tests'Junio C Hamano4-12/+148
2017-06-30hashmap: migrate documentation from Documentation/technical into headerStefan Beller2-341/+316
2017-06-30patch-ids.c: use hashmap correctlyStefan Beller1-4/+4
2017-06-30hashmap.h: compare function has access to a data fieldStefan Beller19-66/+113
2017-06-30merge-recursive: use DIFF_XDL_SET macroStefan Beller1-3/+3
2017-06-30grep: remove redundant REG_NEWLINE when compiling fixed regexÆvar Arnfjörð Bjarmason1-1/+1
2017-06-30grep: remove regflags from the public grep_opt APIÆvar Arnfjörð Bjarmason4-14/+34
2017-06-30grep: remove redundant and verbose re-assignments to 0Ævar Arnfjörð Bjarmason1-11/+0
2017-06-30grep: remove redundant "fixed" field re-assignment to 0Ævar Arnfjörð Bjarmason1-2/+0
2017-06-30grep: adjust a redundant grep pattern type assignmentÆvar Arnfjörð Bjarmason1-4/+1