summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-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-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-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
2017-06-30grep: remove redundant double assignment to 0Ævar Arnfjörð Bjarmason1-1/+0
2017-06-30t9700: add tests for Git::unquote_path()Phillip Wood1-0/+7
2017-06-30Git::unquote_path(): throw an exception on bad pathPhillip Wood1-2/+2
2017-06-30Git::unquote_path(): handle '\a'Phillip Wood1-1/+2
2017-06-30add -i: move unquote_path() to Git.pmPhillip Wood2-43/+53
2017-06-30commit-template: distinguish status information unconditionallyKaartic Sivaraam2-2/+24
2017-06-30commit-template: remove outdated notice about explicit pathsKaartic Sivaraam1-6/+0
2017-06-29coccinelle: polish FREE_AND_NULL rulesRené Scharfe1-9/+1
2017-06-28submodule--helper: do not call utf8_fprintf() unnecessarilyJunio C Hamano1-3/+2
2017-06-28t1450: use egrep for regexp "alternation"Junio C Hamano1-1/+1
2017-06-27subtree: honour USE_ASCIIDOCTOR when setA. Wilcox1-7/+19
2017-06-27builtin/fetch cleanup: always set default value for submodule recursingStefan Beller1-3/+2
2017-06-27apply: check git diffs for mutually exclusive header linesRené Scharfe2-0/+33
2017-06-27apply: check git diffs for invalid file modesRené Scharfe2-6/+27
2017-06-27apply: check git diffs for missing old filenamesRené Scharfe2-1/+26
2017-06-27Spelling fixesVille Skyttä28-41/+41
2017-06-26Twelfth batch for 2.14Junio C Hamano1-1/+11
2017-06-26Merge branch 'mb/reword-autocomplete-message'Junio C Hamano1-6/+12
2017-06-26Merge branch 'ks/t7508-indent-fix'Junio C Hamano1-1/+1
2017-06-26Merge branch 'jk/add-p-commentchar-fix'Junio C Hamano2-1/+10
2017-06-26Merge branch 'dt/raise-core-packed-git-limit'Junio C Hamano1-1/+2
2017-06-26Merge branch 'mh/packed-ref-store-prep'Junio C Hamano5-11/+54
2017-06-26Merge branch 'lb/status-stash-count'Junio C Hamano12-38/+115
2017-06-26pack-bitmap: don't perform unaligned memory accessJames Clarke1-1/+1
2017-06-26sha1_file: refactor has_sha1_file_with_flagsJonathan Tan4-23/+13
2017-06-26sha1_file: do not access pack if unneededJonathan Tan1-0/+11
2017-06-26sha1_file: teach sha1_object_info_extended more flagsJonathan Tan2-19/+28
2017-06-25t1700: make sure split-index respects core.sharedrepositoryChristian Couder1-0/+30
2017-06-25t1301: move modebits() to test-lib-functions.shChristian Couder2-11/+12
2017-06-25read-cache: use shared perms when writing shared indexChristian Couder1-0/+8
2017-06-24Sync with 2.13.2Junio C Hamano2-12/+17
2017-06-24Git 2.13.2v2.13.2Junio C Hamano2-1/+18
2017-06-24Merge branch 'sn/reset-doc-typofix' into maintJunio C Hamano1-1/+1
2017-06-24Merge branch 'sg/doc-pretty-formats' into maintJunio C Hamano1-2/+2
2017-06-24Merge branch 'sd/t3200-branch-m-test' into maintJunio C Hamano1-0/+17
2017-06-24Merge branch 'sg/revision-parser-skip-prefix' into maintJunio C Hamano2-48/+44
2017-06-24Merge branch 'km/test-mailinfo-b-failure' into maintJunio C Hamano1-0/+42
2017-06-24Merge branch 'sb/submodule-rm-absorb' into maintJunio C Hamano1-4/+5
2017-06-24Merge branch 'jc/diff-tree-stale-comment' into maintJunio C Hamano1-3/+5
2017-06-24Merge branch 'ps/stash-push-pathspec-fix' into maintJunio C Hamano2-0/+19
2017-06-24Merge branch 'ls/github' into maintJunio C Hamano2-0/+26
2017-06-24Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano1-1/+7
2017-06-24Merge branch 'jk/diff-blob' into maintJunio C Hamano10-147/+301
2017-06-24Merge branch 'jc/name-rev-lw-tag' into maintJunio C Hamano2-8/+53
2017-06-24Eleventh batch for 2.14Junio C Hamano1-15/+46
2017-06-24Merge branch 'ab/free-and-null'Junio C Hamano49-195/+117
2017-06-24Merge branch 'jk/warn-add-gitlink'Junio C Hamano10-12/+113
2017-06-24Merge branch 'bw/config-h'Junio C Hamano147-229/+397
2017-06-24Merge branch 'bw/ls-files-sans-the-index'Junio C Hamano15-123/+168
2017-06-24Merge branch 'js/alias-early-config'Junio C Hamano8-61/+49
2017-06-24Merge branch 'sn/reset-doc-typofix'Junio C Hamano1-1/+1
2017-06-24Merge branch 'sg/doc-pretty-formats'Junio C Hamano1-2/+2
2017-06-24Merge branch 'rs/pretty-add-again'Junio C Hamano3-45/+0
2017-06-24Merge branch 'jk/diff-highlight-module'Junio C Hamano5-19/+82
2017-06-24Merge branch 'ah/doc-gitattributes-empty-index'Junio C Hamano1-1/+1
2017-06-24Merge branch 'ab/wildmatch-glob-slash-test'Junio C Hamano1-0/+2
2017-06-24Merge branch 'ab/pcre-v2'Junio C Hamano1-1/+1
2017-06-24Merge branch 'da/mergetools-meld-output-opt-on-macos'Junio C Hamano1-1/+1
2017-06-24Merge branch 'nd/split-index-unshare'Junio C Hamano3-47/+21
2017-06-24Revert "split-index: add and use unshare_split_index()"Junio C Hamano3-47/+21
2017-06-24doc: clarify syntax for %C(auto,...) in pretty formatsAndreas Heiduk1-5/+6
2017-06-24strbuf.h comment: discuss strbuf_addftime() arguments in orderÆvar Arnfjörð Bjarmason1-1/+1
2017-06-24sha1_file: guard against invalid loose subdirectory numbersRené Scharfe5-6/+9
2017-06-24sha1_file: let for_each_file_in_obj_subdir() handle subdir namesRené Scharfe2-9/+14
2017-06-24p4205: add perf test script for pretty log formatsRené Scharfe1-0/+16
2017-06-23wildmatch: remove unused wildopts parameterÆvar Arnfjörð Bjarmason16-29/+22
2017-06-23ls-files: use repository objectBrandon Williams3-115/+118
2017-06-23repository: enable initialization of submodulesBrandon Williams2-0/+64
2017-06-23submodule: convert is_submodule_initialized to work on a repositoryBrandon Williams4-18/+16
2017-06-23submodule: add repo_read_gitmodulesBrandon Williams2-0/+17
2017-06-23submodule-config: store the_submodule_cache in the_repositoryBrandon Williams4-18/+72
2017-06-23repository: add index_state to struct repoBrandon Williams2-0/+25
2017-06-23config: read config from a repository objectBrandon Williams4-74/+183
2017-06-23path: add repo_worktree_path and strbuf_repo_worktree_pathBrandon Williams2-0/+49
2017-06-23path: add repo_git_path and strbuf_repo_git_pathBrandon Williams2-0/+29
2017-06-23path: worktree_git_path() should not use file relocationBrandon Williams1-1/+2
2017-06-23path: convert do_git_path to take a 'struct repository'Brandon Williams1-14/+28
2017-06-23path: convert strbuf_git_common_path to take a 'struct repository'Brandon Williams3-8/+16
2017-06-23path: always pass in commondir to update_common_dirBrandon Williams1-3/+1
2017-06-23path: create path.hBrandon Williams3-58/+64
2017-06-23environment: store worktree in the_repositoryBrandon Williams1-5/+4
2017-06-23environment: place key repository state in the_repositoryBrandon Williams4-53/+34
2017-06-23repository: introduce the repository objectBrandon Williams3-0/+224
2017-06-23environment: remove namespace_len variableBrandon Williams1-5/+4
2017-06-23setup: add comment indicating a hackBrandon Williams1-0/+6
2017-06-23setup: don't perform lazy initialization of repository stateBrandon Williams3-9/+24
2017-06-23Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano155-413/+614
2017-06-23pull: optionally rebase submodules (remote submodule changes only)Stefan Beller5-16/+157
2017-06-23builtin/fetch: parse recurse-submodules-default at default options parsingStefan Beller1-9/+10
2017-06-23builtin/fetch: factor submodule recurse parsing out to submodule configStefan Beller3-16/+27