summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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-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-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-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-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-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-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
2018-11-07Windows: force-recompile git.res for differing architecturesJohannes Schindelin1-1/+1
2018-11-07approxidate: fix NULL dereference in date_time()Jeff King2-1/+2
2018-11-07pull: handle --verify-signatures for unborn branchJeff King2-0/+18
2018-11-07merge: handle --verify-signatures for unborn branchJeff King2-0/+11
2018-11-07merge: extract verify_merge_signature() helperJeff King3-25/+34
2018-11-06Ninth batch for 2.20Junio C Hamano1-2/+57
2018-11-06Merge branch 'sg/test-verbose-log'Junio C Hamano2-2/+3
2018-11-06Merge branch 'rj/header-cleanup'Junio C Hamano3-3/+6
2018-11-06Merge branch 'ss/travis-ci-force-vm-mode'Junio C Hamano1-2/+0
2018-11-06Merge branch 'sg/test-rebase-editor-fix'Junio C Hamano2-7/+7
2018-11-06Merge branch 'tb/char-may-be-unsigned'Junio C Hamano1-1/+1
2018-11-06Merge branch 'js/mingw-ns-filetime'Junio C Hamano3-38/+76
2018-11-06Merge branch 'md/exclude-promisor-objects-fix'Junio C Hamano8-2/+15
2018-11-06Merge branch 'jw/send-email-no-auth'Junio C Hamano2-3/+12
2018-11-06Merge branch 'nd/submodule-unused-vars'Junio C Hamano4-31/+38
2018-11-06Merge branch 'nd/unpack-trees-with-cache-tree'Junio C Hamano1-1/+1
2018-11-06Merge branch 'nd/completion-negation'Junio C Hamano1-1/+1
2018-11-06Merge branch 'jt/upload-pack-v2-fix-shallow'Junio C Hamano2-63/+115
2018-11-06Merge branch 'sb/submodule-url-to-absolute'Junio C Hamano2-17/+58
2018-11-06Merge branch 'js/shallow-and-fetch-prune'Junio C Hamano5-8/+54
2018-11-06Merge branch 'js/remote-archive-dwimfix'Junio C Hamano6-4/+23
2018-11-06completion: use __gitcomp_builtin for format-patchDuy Nguyen2-10/+14
2018-11-06midx: double-check large object write loopJeff King1-3/+9
2018-11-06assert NOARG/NONEG behavior of parse-options callbacksJeff King26-3/+134
2018-11-06parse-options: drop OPT_DATE()Jeff King5-38/+0
2018-11-06apply: return -1 from option callback instead of calling exit(1)Jeff King1-1/+1
2018-11-06cat-file: report an error on multiple --batch optionsJeff King1-1/+1
2018-11-06tag: mark "--message" option with NONEGJeff King1-2/+2
2018-11-06show-branch: mark --reflog option as NONEGJeff King1-1/+1
2018-11-06format-patch: mark "--no-numbered" option with NONEGJeff King1-1/+1
2018-11-06status: mark --find-renames option with NONEGJeff King1-1/+1
2018-11-06cat-file: mark batch options with NONEGJeff King1-2/+4
2018-11-06pack-objects: mark index-version option as NONEGJeff King1-1/+1
2018-11-06ls-files: mark exclude options as NONEGJeff King1-3/+4
2018-11-06am: handle --no-patch-format optionJeff King1-1/+3
2018-11-06apply: mark include/exclude options as NONEGJeff King1-2/+2
2018-11-06refresh_index: remove unnecessary calls to preload_index()Ben Peart4-4/+4
2018-11-05Clean up pthread_create() error handlingNguyễn Thái Ngọc Duy3-9/+17
2018-11-05read-cache.c: initialize copy_len to shut up gcc 8Nguyễn Thái Ngọc Duy1-3/+1
2018-11-05read-cache.c: reduce branching based on HAVE_THREADSNguyễn Thái Ngọc Duy1-10/+9
2018-11-05read-cache.c: remove #ifdef NO_PTHREADSNguyễn Thái Ngọc Duy1-24/+10
2018-11-05pack-objects: remove #ifdef NO_PTHREADSNguyễn Thái Ngọc Duy2-30/+2
2018-11-05preload-index.c: remove #ifdef NO_PTHREADSNguyễn Thái Ngọc Duy1-13/+2
2018-11-05grep: clean up num_threads handlingNguyễn Thái Ngọc Duy1-31/+27
2018-11-05grep: remove #ifdef NO_PTHREADSNguyễn Thái Ngọc Duy3-49/+22
2018-11-05attr.c: remove #ifdef NO_PTHREADSNguyễn Thái Ngọc Duy1-14/+0
2018-11-05name-hash.c: remove #ifdef NO_PTHREADSNguyễn Thái Ngọc Duy1-18/+4
2018-11-05index-pack: remove #ifdef NO_PTHREADSNguyễn Thái Ngọc Duy1-49/+14
2018-11-05send-pack.c: move async's #ifdef NO_PTHREADS back to run-command.cNguyễn Thái Ngọc Duy3-3/+12
2018-11-05run-command.h: include thread-utils.h instead of pthread.hNguyễn Thái Ngọc Duy1-3/+1
2018-11-05xdiff-interface: drop parse_hunk_header()Jeff King2-48/+0
2018-11-05range-diff: use a hunk callbackJeff King1-1/+9
2018-11-05diff: convert --check to use a hunk callbackJeff King1-8/+12
2018-11-05combine-diff: use an xdiff hunk callbackJeff King1-31/+36
2018-11-05diff: use hunk callback for word-diffJeff King2-7/+8
2018-11-05diff: discard hunk headers for patch-ids earlierJeff King1-6/+2
2018-11-05diff: avoid generating unused hunk header linesJeff King4-3/+18
2018-11-05poll: use GetTickCount64() to avoid wrap-around issuesSteve Hoelzer1-4/+8
2018-11-05t/t7510-signed-commit.sh: add signing subkey to Eris Discordia keyMichał Górny2-9/+59
2018-11-05t/t7510-signed-commit.sh: Add %GP to custom format checksMichał Górny1-6/+12
2018-11-05tree-walk.c: fix overoptimistic inclusion in :(exclude) matchingNguyễn Thái Ngọc Duy2-3/+25
2018-11-05sequencer.c: remove a stray semicolonNguyễn Thái Ngọc Duy1-1/+1
2018-11-05git-worktree.txt: correct linkgit command nameNguyễn Thái Ngọc Duy1-1/+1
2018-11-05build: link with curl-defined linker flagsJames Knight3-28/+22
2018-11-03Merge branch 'jc/http-curlver-warnings'Junio C Hamano1-4/+2
2018-11-03Merge branch 'js/mingw-http-ssl'Junio C Hamano2-1/+91
2018-11-03Merge branch 'mg/gpg-fingerprint'Junio C Hamano5-18/+70
2018-11-03Merge branch 'mg/gpg-parse-tighten'Junio C Hamano2-29/+87
2018-11-03Merge branch 'en/merge-cleanup-more'Junio C Hamano2-7/+37
2018-11-03add: speed up cmd_add() by utilizing read_cache_preload()Ben Peart1-5/+4
2018-11-03remote: make add_missing_tags() linearDerrick Stolee1-1/+33
2018-11-03test-reach: test get_reachable_subsetDerrick Stolee2-4/+82
2018-11-03commit-reach: implement get_reachable_subsetDerrick Stolee2-0/+82
2018-11-02send-email: avoid empty transfer encoding headerAaron Lindsay2-1/+16
2018-11-02pathspec: handle non-terminated strings with :(attr)Jeff King1-0/+7
2018-11-02approxidate: handle pending number for "specials"Jeff King2-27/+34
2018-11-02rev-list: handle flags for --indexed-objectsJeff King2-6/+16
2018-11-02xdiff-interface: provide a separate consume callback for hunksJeff King6-20/+48
2018-11-02xdiff: provide a separate emit callback for hunksJeff King5-8/+27
2018-11-02t6012: make rev-list tests more interestingDerrick Stolee1-9/+36
2018-11-02revision.c: generation-based topo-order algorithmDerrick Stolee3-7/+194
2018-11-02commit/revisions: bookkeeping before refactoringDerrick Stolee3-13/+21
2018-11-02revision.c: begin refactoring --topo-order logicDerrick Stolee2-4/+42
2018-11-02test-reach: add rev-list testsDerrick Stolee1-0/+84
2018-11-02test-reach: add run_three_modes methodDerrick Stolee1-4/+8
2018-11-02prio-queue: add 'peek' operationDerrick Stolee4-8/+47
2018-11-02travis-ci: install packages in 'ci/install-dependencies.sh'SZEDER Gábor2-27/+29
2018-11-02tests: optionally skip `git rebase -p` testsJohannes Schindelin14-36/+69
2018-11-02t3418: decouple test cases from a previous `rebase -p` test caseJohannes Schindelin1-0/+1
2018-11-02t3404: decouple some test cases from outcomes of previous test casesJohannes Schindelin1-7/+8
2018-11-02Eighth batch for 2.20Junio C Hamano1-0/+6
2018-11-02rebase: apply cocci patchJunio C Hamano1-1/+1
2018-11-02Merge branch 'js/rebase-i-shortopt'Junio C Hamano3-3/+6
2018-11-02Merge branch 'js/rebase-i-break'Junio C Hamano5-3/+40
2018-11-02Merge branch 'js/rebase-autostash-fix'Junio C Hamano2-3/+15
2018-11-02Merge branch 'cb/printf-empty-format'Junio C Hamano1-1/+1
2018-11-02Merge branch 'jc/rebase-in-c-5-test-typofix'Junio C Hamano1-3/+3
2018-11-02Merge branch 'pk/rebase-in-c-6-final'Junio C Hamano1-1/+1
2018-11-02Merge branch 'js/rebase-in-c-5.5-work-with-rebase-i-in-c'Junio C Hamano1-4/+83
2018-11-02Merge branch 'pk/rebase-in-c-5-test'Junio C Hamano1-15/+135
2018-11-02Merge branch 'pk/rebase-in-c-4-opts'Junio C Hamano4-85/+530
2018-11-02Merge branch 'pk/rebase-in-c-3-acts'Junio C Hamano3-4/+201
2018-11-02Merge branch 'pk/rebase-in-c-2-basic'Junio C Hamano1-13/+321
2018-11-02Merge branch 'ag/rebase-i-in-c'Junio C Hamano17-451/+742
2018-11-02Merge branch 'pk/rebase-in-c'Junio C Hamano7-68/+503
2018-11-01fetch: replace string-list used as a look-up table with a hashmapJunio C Hamano1-46/+100
2018-11-01rev-parse: clear --exclude list after 'git rev-parse --all'Andreas Gruenbacher2-0/+13
2018-11-01fetch-pack: be more precise in parsing v2 responseJonathan Tan2-0/+62