summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2018-11-21Git 2.20-rc1v2.20.0-rc1Junio C Hamano2-3/+8
2018-11-21Sync with 2.19.2Junio C Hamano1-0/+108
2018-11-21Git 2.19.2v2.19.2Junio C Hamano3-2/+110
2018-11-21Merge branch 'sg/test-rebase-editor-fix' into maintJunio C Hamano2-7/+7
2018-11-21Merge branch 'tb/char-may-be-unsigned' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'jk/uploadpack-packobjectshook-fix' into maintJunio C Hamano1-3/+6
2018-11-21Merge branch 'uk/merge-subtree-doc-update' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'jc/cocci-preincr' into maintJunio C Hamano2-1/+6
2018-11-21Merge branch 'ah/doc-updates' into maintJunio C Hamano12-79/+92
2018-11-21Merge branch 'sg/doc-show-branch-typofix' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'tq/branch-style-fix' into maintJunio C Hamano1-2/+1
2018-11-21Merge branch 'tq/branch-create-wo-branch-get' into maintJunio C Hamano1-5/+0
2018-11-21Merge branch 'sb/strbuf-h-update' into maintJunio C Hamano1-67/+81
2018-11-21Merge branch 'du/cherry-is-plumbing' into maintJunio C Hamano2-12/+1
2018-11-21Merge branch 'du/get-tar-commit-id-is-plumbing' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'mm/doc-no-dashed-git' into maintJunio C Hamano2-3/+3
2018-11-21Merge branch 'du/rev-parse-is-plumbing' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'ma/t7005-bash-workaround' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'jc/how-to-document-api' into maintJunio C Hamano1-1/+4
2018-11-21Merge branch 'mw/doc-typofixes' into maintJunio C Hamano2-3/+2
2018-11-21Merge branch 'rs/sequencer-oidset-insert-avoids-dups' into maintJunio C Hamano1-3/+1
2018-11-21Merge branch 'ma/mailing-list-address-in-git-help' into maintJunio C Hamano1-1/+3
2018-11-21Merge branch 'nd/packobjectshook-doc-fix' into maintJunio C Hamano1-4/+4
2018-11-21Merge branch 'ma/t1400-undebug-test' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'ma/commit-graph-docs' into maintJunio C Hamano2-19/+20
2018-11-21Merge branch 'dz/credential-doc-url-matching-rules' into maintJunio C Hamano1-0/+6
2018-11-21Merge branch 'jk/check-everything-connected-is-long-gone' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'fe/doc-updates' into maintJunio C Hamano3-5/+39
2018-11-21Merge branch 'tg/t5551-with-curl-7.61.1' into maintJunio C Hamano1-34/+34
2018-11-21Merge branch 'tq/refs-internal-comment-fix' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'sg/split-index-test' into maintJunio C Hamano2-8/+11
2018-11-21Merge branch 'bw/protocol-v2' into maintJunio C Hamano1-0/+2
2018-11-21Merge branch 'sb/string-list-remove-unused' into maintJunio C Hamano2-18/+0
2018-11-21Merge branch 'jk/dev-build-format-security' into maintJunio C Hamano1-0/+1
2018-11-21Merge branch 'sg/t3701-tighten-trace' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'en/double-semicolon-fix' into maintJunio C Hamano3-3/+3
2018-11-21Merge branch 'tb/void-check-attr' into maintJunio C Hamano9-69/+57
2018-11-21Merge branch 'sg/doc-trace-appends' into maintJunio C Hamano1-2/+2
2018-11-21Merge branch 'tg/conflict-marker-size' into maintJunio C Hamano1-0/+4
2018-11-21Merge branch 'ts/doc-build-manpage-xsl-quietly' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'jk/detect-truncated-zlib-input' into maintJunio C Hamano3-7/+35
2018-11-21Merge branch 'sg/test-verbose-log' into maintJunio C Hamano2-2/+3
2018-11-21Merge branch 'ss/travis-ci-force-vm-mode' into maintJunio C Hamano1-2/+0
2018-11-21Merge branch 'md/exclude-promisor-objects-fix' into maintJunio C Hamano8-2/+15
2018-11-21Merge branch 'js/shallow-and-fetch-prune' into maintJunio C Hamano5-8/+54
2018-11-21Merge branch 'jc/receive-deny-current-branch-fix' into maintJunio C Hamano2-4/+16
2018-11-21Merge branch 'js/diff-notice-has-drive-prefix' into maintJunio C Hamano2-2/+12
2018-11-21Merge branch 'js/pack-objects-mutex-init-fix' into maintJunio C Hamano4-2/+36
2018-11-21Merge branch 'jk/run-command-notdot' into maintJunio C Hamano2-5/+29
2018-11-21Merge branch 'np/log-graph-octopus-fix' into maintJunio C Hamano2-15/+145
2018-11-21Merge branch 'sg/split-index-racefix' into maintJunio C Hamano5-42/+363
2018-11-21Merge branch 'jt/non-blob-lazy-fetch' into maintJunio C Hamano3-42/+121
2018-11-21Merge branch 'sm/show-superproject-while-conflicted' into maintJunio C Hamano2-1/+17
2018-11-21Merge branch 'en/status-multiple-renames-to-the-same-target-fix' into maintJunio C Hamano2-0/+24
2018-11-21Merge branch 'jn/mailmap-update' into maintJunio C Hamano1-1/+1
2018-11-21Merge branch 'ds/commit-graph-with-grafts' into maintJunio C Hamano16-30/+194
2018-11-21Merge branch 'tg/range-diff-corner-case-fix' into maintJunio C Hamano2-0/+11
2018-11-21Merge branch 'en/update-ref-no-deref-stdin' into maintJunio C Hamano3-12/+46
2018-11-21Merge branch 'ms/remote-error-message-update' into maintJunio C Hamano2-5/+5
2018-11-21Merge branch 'jt/lazy-object-fetch-fix' into maintJunio C Hamano5-19/+22
2018-11-21Merge branch 'en/sequencer-empty-edit-result-aborts' into maintJunio C Hamano4-17/+14
2018-11-21Merge branch 'nd/attr-pathspec-fix' into maintJunio C Hamano2-2/+2
2018-11-21Merge branch 'en/rerere-multi-stage-1-fix' into maintJunio C Hamano2-1/+30
2018-11-21Merge branch 'js/mingw-o-append' into maintJunio C Hamano6-3/+129
2018-11-21Merge branch 'jk/reopen-tempfile-truncate' into maintJunio C Hamano4-5/+23
2018-11-21Merge branch 'bp/mv-submodules-with-fsmonitor' into maintJunio C Hamano1-2/+1
2018-11-21Merge branch 'js/rebase-i-autosquash-fix' into maintJunio C Hamano2-3/+33
2018-11-21Merge branch 'jk/trailer-fixes' into maintJunio C Hamano14-39/+175
2018-11-21Merge branch 'cc/shared-index-permbits'Junio C Hamano2-1/+22
2018-11-21Merge branch 'nd/clone-case-smashing-warning'Junio C Hamano2-3/+3
2018-11-21Merge branch 'tz/build-tech-midx-doc'Junio C Hamano1-0/+1
2018-11-21Merge branch 'jn/eoie-ieot'Junio C Hamano5-18/+69
2018-11-21Merge branch 'cc/delta-islands'Junio C Hamano3-3/+6
2018-11-21Merge branch 'js/rebase-am-options-fix'Junio C Hamano1-0/+8
2018-11-21Merge branch 'js/builtin-rebase-perf-fix-err-fix'Junio C Hamano1-1/+2
2018-11-21index: make index.threads=true enable ieot and eoieJonathan Nieder4-16/+32
2018-11-21clone: fix colliding file detection on APFSNguyễn Thái Ngọc Duy2-3/+3
2018-11-21Documentation: build technical/multi-pack-indexTodd Zullinger1-0/+1
2018-11-21pack-objects: fix off-by-one in delta-island tree-depth computationJeff King1-1/+3
2018-11-21pack-objects: zero-initialize tree_depth/layer arraysJeff King2-2/+3
2018-11-21pack-objects: fix tree_depth and layer invariantsJeff King1-2/+2
2018-11-21rebase: warn about the correct tree's OIDJohannes Schindelin1-1/+2
2018-11-21ieot: default to not writing IEOT sectionJonathan Nieder2-1/+17
2018-11-21eoie: default to not writing EOIE sectionJonathan Nieder3-5/+24
2018-11-21legacy-rebase: backport -C<n> and --whitespace=<option> checksJohannes Schindelin1-0/+8
2018-11-19Prepare for 2.20-rc1Junio C Hamano1-0/+29
2018-11-19Merge branch 'sb/cocci-pending'Junio C Hamano2-2/+46
2018-11-19Merge branch 'js/test-git-installed'Junio C Hamano4-8/+25
2018-11-19Merge branch 'dd/poll-dot-h'Junio C Hamano3-2/+17
2018-11-19Merge branch 'tb/print-size-t-with-uintmax-format'Junio C Hamano11-23/+24
2018-11-19Merge branch 'tb/xcurl-off-t'Junio C Hamano1-3/+4
2018-11-19Merge branch 'nd/format-patch-cover-letter-stat-width'Junio C Hamano2-17/+33
2018-11-19Merge branch 'ds/push-squelch-ambig-warning'Junio C Hamano1-0/+6
2018-11-19Merge branch 'ab/dynamic-gettext-poison'Junio C Hamano16-49/+59
2018-11-19read-cache: make the split index obey umask settingsÆvar Arnfjörð Bjarmason2-1/+22
2018-11-19RelNotes: name the release properlyJunio C Hamano1-2/+2
2018-11-18Git 2.20-rc0v2.20.0-rc0Junio C Hamano2-1/+63
2018-11-18Merge branch 'jk/close-duped-fd-before-unlock-for-bundle'Junio C Hamano2-21/+24
2018-11-18Merge branch 'ab/rebase-in-c-escape-hatch'Junio C Hamano3-1/+22
2018-11-18Merge branch 'js/rebase-am-options'Junio C Hamano2-63/+52
2018-11-18Merge branch 'sg/ref-filter-wo-repository'Junio C Hamano2-0/+10
2018-11-18Merge branch 'nd/doc-extensions'Junio C Hamano3-19/+16
2018-11-18Merge branch 'js/fuzz-cxxflags'Junio C Hamano1-2/+4
2018-11-18Merge branch 'js/mingw-msdn-url'Junio C Hamano1-2/+2
2018-11-18Merge branch 'js/mingw-create-hard-link'Junio C Hamano1-13/+1
2018-11-18Merge branch 'js/config-sequence'Junio C Hamano1-0/+2
2018-11-18Merge branch 'lj/mingw-pthread-cond'Junio C Hamano2-159/+7
2018-11-18Merge branch 'nd/command-list-gen-fix'Junio C Hamano1-1/+1
2018-11-18Merge branch 'ag/p3400-force-checkout'Junio C Hamano1-5/+5
2018-11-18Merge branch 'cb/notes-freeing-always-null-fix'Junio C Hamano1-3/+1
2018-11-18Merge branch 'js/rebase-r-and-merge-head'Junio C Hamano4-6/+32
2018-11-18Merge branch 'js/apply-recount-allow-noop'Junio C Hamano2-1/+13
2018-11-18Merge branch 'ra/rev-parse-exclude-glob'Junio C Hamano2-3/+61
2018-11-18Merge branch 'js/builtin-rebase-perf-fix'Junio C Hamano1-33/+46
2018-11-18Merge branch 'js/mailmap'Junio C Hamano1-0/+13
2018-11-18Merge branch 'js/rebase-autostash-detach-fix'Junio C Hamano2-1/+10
2018-11-18Merge branch 'ab/range-diff-no-patch'Junio C Hamano3-1/+49
2018-11-18Merge branch 'jk/verify-sig-merge-into-void'Junio C Hamano6-25/+64
2018-11-18Merge branch 'js/mingw-res-rebuild'Junio C Hamano1-1/+1
2018-11-18Merge branch 'jk/unused-parameter-fixes'Junio C Hamano30-60/+164
2018-11-18Merge branch 'jk/curl-ldflags'Junio C Hamano3-28/+22
2018-11-18Merge branch 'mg/gpg-fingerprint-test'Junio C Hamano2-14/+70
2018-11-18Merge branch 'nd/pthreads'Junio C Hamano16-231/+186
2018-11-18Merge branch 'ds/reachable-topo-order'Junio C Hamano11-39/+427
2018-11-17bundle: dup() output descriptor closer to point-of-useJeff King2-21/+24
2018-11-16tests: add a special setup where rebase.useBuiltin is offÆvar Arnfjörð Bjarmason2-1/+8
2018-11-16rebase doc: document rebase.useBuiltinÆvar Arnfjörð Bjarmason1-0/+14
2018-11-16mingw: replace an obsolete link with the superseding oneJohannes Schindelin1-2/+2
2018-11-16Makefile: use FUZZ_CXXFLAGS for linking fuzzersJosh Steadmon1-2/+4
2018-11-16tests: explicitly use `git.exe` on WindowsJohannes Schindelin3-5/+11
2018-11-16tests: do not require Git to be built when testing an installed GitJohannes Schindelin1-2/+7
2018-11-16doc: move extensions.worktreeConfig to the right placeNguyễn Thái Ngọc Duy3-19/+16
2018-11-16ref-filter: don't look for objects when outside of a repositorySZEDER Gábor2-0/+10
2018-11-16config: report a bug if git_dir exists without commondirJohannes Schindelin1-0/+2
2018-11-16rebase: validate -C<n> and --whitespace=<mode> parameters earlyJohannes Schindelin2-1/+18
2018-11-16rebase: really just passthru the `git am` optionsJohannes Schindelin1-63/+35
2018-11-14git-compat-util: prefer poll.h to sys/poll.hĐoàn Trần Công Danh3-2/+17
2018-11-14range-diff: make diff option behavior (e.g. --stat) consistentÆvar Arnfjörð Bjarmason2-24/+2
2018-11-14win32: replace pthread_cond_*() with much simpler codeLoo Rong Jie2-159/+7
2018-11-14mingw: use `CreateHardLink()` directlyJohannes Schindelin1-13/+1
2018-11-14t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLED is setJohannes Schindelin1-1/+6
2018-11-14tests: respect GIT_TEST_INSTALLED when initializing repositoriesJohannes Schindelin1-1/+2
2018-11-14tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/Johannes Schindelin1-1/+1
2018-11-14coccicheck: introduce 'pending' semantic patchesSZEDER Gábor2-2/+46
2018-11-13Tenth batch for 2.20Junio C Hamano1-0/+98
2018-11-13Merge branch 'nd/complete-format-patch'Junio C Hamano2-10/+14
2018-11-13Merge branch 'nd/tree-walk-path-exclusion'Junio C Hamano2-3/+25
2018-11-13Merge branch 'sg/travis-install-dependencies'Junio C Hamano2-27/+29
2018-11-13Merge branch 'bp/add-diff-files-optim'Junio C Hamano1-5/+4
2018-11-13Merge branch 'jk/xdiff-interface'Junio C Hamano10-115/+143
2018-11-13Merge branch 'jk/misc-unused-fixes'Junio C Hamano5-34/+59
2018-11-13Merge branch 'nd/per-worktree-ref-iteration'Junio C Hamano16-47/+449
2018-11-13Merge branch 'bp/refresh-index-using-preload'Junio C Hamano7-8/+17
2018-11-13Merge branch 'ag/rebase-i-in-c'Junio C Hamano1-1/+1
2018-11-13Merge branch 'al/send-email-auto-cte-fixup'Junio C Hamano2-1/+16
2018-11-13Merge branch 'ds/add-missing-tags'Junio C Hamano5-5/+197
2018-11-13Merge branch 'sh/mingw-safer-compat-poll'Junio C Hamano1-4/+8
2018-11-13Merge branch 'js/rebase-p-tests'Junio C Hamano14-43/+78
2018-11-13Merge branch 'pw/am-rebase-read-author-script'Junio C Hamano3-127/+128
2018-11-13Merge branch 'jc/war-on-string-list'Junio C Hamano1-46/+100
2018-11-13Merge branch 'ag/rev-parse-all-exclude-fix'Junio C Hamano2-0/+13
2018-11-13Merge branch 'jt/tighten-fetch-proto-v2-response'Junio C Hamano2-0/+62
2018-11-13Merge branch 'ao/submodule-wo-gitmodules-checked-out'Junio C Hamano16-32/+454
2018-11-13Merge branch 'nb/worktree-api-doc'Junio C Hamano3-9/+9
2018-11-13Merge branch 'ma/sequencer-do-reset-saner-loop-termination'Junio C Hamano1-2/+5
2018-11-13Merge branch 'js/mingw-utf8-env'Junio C Hamano3-117/+197
2018-11-13Merge branch 'js/mingw-perl5lib'Junio C Hamano8-23/+109
2018-11-13Merge branch 'js/mingw-isatty-and-dup2'Junio C Hamano2-0/+15
2018-11-13Merge branch 'ab/pack-tests-cleanup'Junio C Hamano2-23/+28
2018-11-13Merge branch 'ds/test-multi-pack-index'Junio C Hamano8-11/+42
2018-11-13Merge branch 'nd/wildmatch-double-asterisk'Junio C Hamano4-6/+6
2018-11-13Merge branch 'nd/per-worktree-config'Junio C Hamano12-78/+255
2018-11-13Merge branch 'jk/stream-pack-non-delta-clarification'Junio C Hamano1-0/+9
2018-11-13Merge branch 'jk/proto-v2-ref-prefix-fix'Junio C Hamano2-8/+23
2018-11-13Merge branch 'jk/detect-truncated-zlib-input'Junio C Hamano3-7/+35
2018-11-13Merge branch 'nd/config-split'Junio C Hamano88-2894/+2980
2018-11-13format-patch: respect --stat in cover letter's diffstatNguyễn Thái Ngọc Duy2-17/+33
2018-11-13built-in rebase: reinstate `checkout -q` behavior where appropriateJohannes Schindelin1-15/+25
2018-11-13rebase: prepare reset_head() for more flagsJohannes Schindelin1-3/+6
2018-11-13rebase: consolidate clean-up code before leaving reset_head()Johannes Schindelin1-18/+18
2018-11-13refs: fix some exclude patterns being ignoredRafael Ascensão2-12/+16
2018-11-13refs: show --exclude failure with --branches/tags/remotes=globRafael Ascensão1-3/+57
2018-11-13apply --recount: allow "no-op hunks"Johannes Schindelin2-1/+13
2018-11-13status: rebase and merge can be in progress at the same timeJohannes Schindelin1-2/+7
2018-11-13built-in rebase --skip/--abort: clean up stale .git/<name> filesJohannes Schindelin1-0/+3
2018-11-13rebase -i: include MERGE_HEAD into files to clean upJohannes Schindelin1-0/+2
2018-11-13rebase -r: do not write MERGE_HEAD unless neededJohannes Schindelin2-5/+5
2018-11-13rebase -r: demonstrate bug with conflicting mergesJohannes Schindelin1-0/+16
2018-11-13builtin/notes: remove unnecessary freeCarlo Marcelo Arenas Belón1-3/+1
2018-11-12remote-curl.c: xcurl_off_t is not portable (on 32 bit platfoms)Torsten Bögershausen1-3/+4
2018-11-12Upcast size_t variables to uintmax_t when printingTorsten Bögershausen11-23/+24
2018-11-12p3400: replace calls to `git checkout -b' by `git checkout -B'Alban Gruin1-5/+5
2018-11-12build: fix broken command-list.h generation with core.autocrlfNguyễn Thái Ngọc Duy1-1/+1
2018-11-12Update .mailmapJohannes Schindelin1-0/+13
2018-11-12range-diff: fix regression in passing along diff optionsÆvar Arnfjörð Bjarmason2-1/+54
2018-11-12range-diff doc: add a section about output stabilityÆvar Arnfjörð Bjarmason1-0/+17
2018-11-09Makefile: ease dynamic-gettext-poison transitionJunio C Hamano1-1/+1
2018-11-09i18n: make GETTEXT_POISON a runtime optionÆvar Arnfjörð Bjarmason16-49/+59
2018-11-08built-in rebase --autostash: leave the current branch alone if possibleJohannes Schindelin2-2/+3
2018-11-08built-in rebase: demonstrate regression with --autostashJohannes Schindelin1-0/+8