summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2019-12-25Git 2.25-rc0v2.25.0-rc0Junio C Hamano2-6/+27
2019-12-25Merge branch 'en/fill-directory-fixes'Junio C Hamano3-51/+354
2019-12-25Merge branch 'rs/test-cleanup'Junio C Hamano5-5/+4
2019-12-25Merge branch 'mr/bisect-save-pointer-to-const-string'Junio C Hamano1-2/+2
2019-12-25Merge branch 'rs/xdiff-ignore-ws-w-func-context'Junio C Hamano1-0/+23
2019-12-25Merge branch 'js/add-p-in-c'Junio C Hamano8-19/+1464
2019-12-25Merge branch 'jc/drop-gen-hdrs'Junio C Hamano1-3/+2
2019-12-25Merge branch 'ja/doc-markup-cleanup'Junio C Hamano3-127/+136
2019-12-25Merge branch 'rs/ref-read-cleanup'Junio C Hamano2-4/+3
2019-12-25Merge branch 'rb/p4-lfs'Junio C Hamano1-2/+8
2019-12-25Merge branch 'pb/submodule-doc-xref'Junio C Hamano1-1/+1
2019-12-25Merge branch 'mr/bisect-use-after-free'Junio C Hamano1-3/+4
2019-12-25Merge branch 'ln/userdiff-elixir'Junio C Hamano1-1/+2
2019-12-25Merge branch 'ds/sparse-cone'Junio C Hamano20-48/+1376
2019-12-25Merge branch 'sg/name-rev-wo-recursion'Junio C Hamano2-66/+153
2019-12-25Merge branch 'ra/t5150-depends-on-perl'Junio C Hamano1-0/+6
2019-12-25Merge branch 'dl/format-patch-notes-config-fixup'Junio C Hamano7-39/+125
2019-12-25Merge branch 'am/pathspec-f-f-checkout'Junio C Hamano9-42/+548
2019-12-25Merge branch 'am/pathspec-from-file'Junio C Hamano2-0/+9
2019-12-20sparse-checkout: improve OS ls compatibilityEd Maste1-14/+22
2019-12-20dir.c: use st_add3() for allocation sizeJunio C Hamano1-1/+1
2019-12-19dir: consolidate similar code in treat_directory()Elijah Newren1-11/+7
2019-12-19dir: synchronize treat_leading_path() and read_directory_recursive()Elijah Newren3-2/+32
2019-12-19dir: fix checks on common prefix directoryElijah Newren2-14/+59
2019-12-19t4015: improve coverage of function context testRené Scharfe1-0/+23
2019-12-18commit: forbid --pathspec-from-file --allAlexandr Miloslavskiy2-0/+9
2019-12-18t3434: mark successful test as suchElijah Newren1-1/+1
2019-12-18notes.h: fix typos in commentDenton Liu1-2/+2
2019-12-18t6030: don't create unused fileRené Scharfe1-1/+1
2019-12-18t5580: don't create unused fileRené Scharfe1-1/+1
2019-12-18t3501: don't create unused fileRené Scharfe1-1/+1
2019-12-17bisect--helper: convert `*_warning` char pointers to char arrays.Tanushree Tumane1-2/+2
2019-12-16The sixth batchJunio C Hamano1-0/+29
2019-12-16Merge branch 'rs/patch-id-use-oid-to-hex'Junio C Hamano1-7/+2
2019-12-16Merge branch 'rs/commit-export-env-simplify'Junio C Hamano1-1/+1
2019-12-16Merge branch 'rs/archive-zip-code-cleanup'Junio C Hamano1-9/+14
2019-12-16Merge branch 'js/t3404-indent-fix'Junio C Hamano1-5/+5
2019-12-16Merge branch 'dr/branch-usage-casefix'Junio C Hamano1-1/+1
2019-12-16Merge branch 'sg/t9300-robustify'Junio C Hamano1-4/+16
2019-12-16Merge branch 'js/add-i-a-bit-more-tests'Junio C Hamano3-11/+97
2019-12-16Merge branch 'dl/range-diff-with-notes'Junio C Hamano4-6/+7
2019-12-16Merge branch 'hw/doc-in-header'Junio C Hamano48-2452/+1931
2019-12-16Merge branch 'rs/xdiff-ignore-ws-w-func-context'Junio C Hamano2-5/+18
2019-12-16Merge branch 'dl/rebase-with-autobase'Junio C Hamano5-11/+26
2019-12-16Merge branch 'dl/test-cleanup'Junio C Hamano12-323/+425
2019-12-16Merge branch 'cs/store-packfiles-in-hashmap'Junio C Hamano4-9/+52
2019-12-16Merge branch 'js/builtin-add-i-cmds'Junio C Hamano1-59/+560
2019-12-16Merge branch 'dd/time-reentrancy'Junio C Hamano3-19/+21
2019-12-16Merge branch 'ag/sequencer-todo-updates'Junio C Hamano2-9/+29
2019-12-16fix-typo: consecutive-word duplicationsryenus5-5/+5
2019-12-13Makefile: drop GEN_HDRSJunio C Hamano1-3/+2
2019-12-13built-in add -p: show helpful hint when nothing can be stagedJohannes Schindelin1-4/+13
2019-12-13built-in add -p: only show the applicable parts of the help textJohannes Schindelin1-4/+28
2019-12-13built-in add -p: implement the 'q' ("quit") commandJohannes Schindelin1-6/+11
2019-12-13built-in add -p: implement the '/' ("search regex") commandJohannes Schindelin2-1/+63
2019-12-13built-in add -p: implement the 'g' ("goto") commandJohannes Schindelin2-0/+104
2019-12-13built-in add -p: implement hunk editingJohannes Schindelin3-17/+325
2019-12-13strbuf: add a helper function to call the editor "on an strbuf"Johannes Schindelin2-0/+39
2019-12-13built-in add -p: coalesce hunks after splitting themJohannes Schindelin1-1/+57
2019-12-13built-in add -p: implement the hunk splitting featureJohannes Schindelin2-2/+225
2019-12-13built-in add -p: show different prompts for mode changes and deletionsJohannes Schindelin1-2/+20
2019-12-13built-in app -p: allow selecting a mode change as a "hunk"Johannes Schindelin1-5/+104
2019-12-13built-in add -p: handle deleted empty filesJohannes Schindelin1-2/+11
2019-12-13built-in add -p: support multi-file diffsJohannes Schindelin1-38/+53
2019-12-13built-in add -p: offer a helpful error message when hunk navigation failedJohannes Schindelin1-11/+33
2019-12-13built-in add -p: color the prompt and the help textJohannes Schindelin1-4/+8
2019-12-13built-in add -p: adjust hunk headers as neededJohannes Schindelin3-23/+151
2019-12-13built-in add -p: show colored hunks by defaultJohannes Schindelin1-17/+62
2019-12-13built-in add -i: wire up the new C code for the `patch` commandJohannes Schindelin1-3/+6
2019-12-13built-in add -i: start implementing the `patch` functionality in CJohannes Schindelin4-5/+277
2019-12-13userdiff: remove empty subexpression from elixir regexEd Maste1-1/+2
2019-12-13doc: indent multi-line items in listJean-Noël Avila2-125/+134
2019-12-13doc: remove non pure ASCII charactersJean-Noël Avila1-2/+2
2019-12-13sparse-checkout: respect core.ignoreCase in cone modeDerrick Stolee4-5/+42
2019-12-13notes: break set_display_notes() into smaller functionsDenton Liu5-32/+45
2019-12-13config/format.txt: clarify behavior of multiple format.notesDenton Liu1-1/+17
2019-12-11gitmodules: link to gitsubmodules guidePhilippe Blain1-1/+1
2019-12-11remote: pass NULL to read_ref_full() because object ID is not neededRené Scharfe1-2/+1
2019-12-11refs: pass NULL to refs_read_ref_full() because object ID is not neededRené Scharfe1-2/+2
2019-12-11t7004: don't create unused fileRené Scharfe1-1/+0
2019-12-11t4256: don't create unused fileRené Scharfe1-1/+1
2019-12-11dir: break part of read_directory_recursive() out for reuseElijah Newren1-23/+37
2019-12-11dir: exit before wildcard fall-through if there is no wildcardElijah Newren2-2/+9
2019-12-11dir: remove stray quote character in commentElijah Newren1-1/+1
2019-12-11Revert "dir.c: make 'git-status --ignored' work within leading directories"Elijah Newren2-5/+7
2019-12-11t3011: demonstrate directory traversal failuresElijah Newren1-0/+209
2019-12-11git-p4: honor lfs.storage configuration variabler.burenkov1-2/+8
2019-12-11bisect--helper: avoid use-after-freeTanushree Tumane1-3/+4
2019-12-10The fifth batchJunio C Hamano1-0/+36
2019-12-10Merge branch 'ag/sequencer-continue-leakfix'Junio C Hamano1-2/+4
2019-12-10Merge branch 'em/test-skip-regex-illseq'Junio C Hamano2-3/+9
2019-12-10Merge branch 'hi/gpg-use-check-signature'Junio C Hamano4-75/+72
2019-12-10Merge branch 'bc/t9001-zsh-in-posix-emulation-mode'Junio C Hamano1-1/+1
2019-12-10Merge branch 'sg/test-squelch-noise-in-commit-bulk'Junio C Hamano1-1/+1
2019-12-10Merge branch 'jk/perf-wo-git-dot-pm'Junio C Hamano1-2/+7
2019-12-10Merge branch 'ds/commit-graph-delay-gen-progress'Junio C Hamano5-8/+23
2019-12-10Merge branch 'jt/clone-recursesub-ref-advise'Junio C Hamano5-1/+19
2019-12-10Merge branch 'as/t7812-missing-redirects-fix'Junio C Hamano1-4/+7
2019-12-10Merge branch 'dl/pretty-reference'Junio C Hamano9-26/+134
2019-12-10Merge branch 'dl/submodule-set-url'Junio C Hamano4-2/+113
2019-12-10Merge branch 'js/mingw-inherit-only-std-handles'Junio C Hamano5-12/+199
2019-12-10Merge branch 'po/bundle-doc-clonable'Junio C Hamano2-6/+20
2019-12-10Merge branch 'ra/rebase-i-more-options'Junio C Hamano6-28/+323
2019-12-10Merge branch 'am/pathspec-from-file'Junio C Hamano9-28/+434
2019-12-09Sync with Git 2.24.1Junio C Hamano47-87/+991
2019-12-09format-patch: move git_config() before repo_init_revisions()Denton Liu1-4/+7
2019-12-09format-patch: use --notes behavior for format.notesDenton Liu2-12/+33
2019-12-09notes: extract logic into set_display_notes()Denton Liu3-16/+38
2019-12-09notes: create init_display_notes() helperDenton Liu3-1/+12
2019-12-09notes: rename to load_display_notes()Denton Liu3-6/+6
2019-12-09name-rev: cleanup name_ref()SZEDER Gábor1-15/+16
2019-12-09name-rev: eliminate recursion in name_rev()SZEDER Gábor2-39/+65
2019-12-09name-rev: use 'name->tip_name' instead of 'tip_name'SZEDER Gábor1-4/+7
2019-12-09archive-zip: use enum for compression methodRené Scharfe1-9/+14
2019-12-09l10n: minor case fix in 'git branch' '--unset-upstream' descriptionDimitriy Ryazantcev1-1/+1
2019-12-09t3404: fix indentationJohannes Schindelin1-5/+5
2019-12-09patch-id: use oid_to_hex() to print multiple object IDsRené Scharfe1-7/+2
2019-12-09commit: use strbuf_add() to add a length-limited stringRené Scharfe1-1/+1
2019-12-06The fourth batchJunio C Hamano1-0/+18
2019-12-06Merge branch 'dl/lore-is-the-archive'Junio C Hamano14-17/+18
2019-12-06Merge branch 'jk/lore-is-the-archive'Junio C Hamano13-30/+30
2019-12-06Merge branch 'tg/perf-remove-stale-result'Junio C Hamano2-11/+5
2019-12-06Merge branch 'jk/send-pack-check-negative-with-quick'Junio C Hamano1-1/+3
2019-12-06Merge branch 'hi/grep-do-not-return-void'Junio C Hamano1-1/+1
2019-12-06Merge branch 'rs/use-skip-prefix-more'Junio C Hamano5-22/+16
2019-12-06Merge branch 'rs/simplify-prepare-cmd'Junio C Hamano1-2/+1
2019-12-06Merge branch 'rs/test-cleanup'Junio C Hamano10-23/+16
2019-12-06Merge branch 'sg/assume-no-todo-update-in-cherry-pick'Junio C Hamano2-1/+31
2019-12-06Merge branch 'sg/osx-force-gcc-9'Junio C Hamano2-4/+5
2019-12-06name-rev: drop name_rev()'s 'generation' and 'distance' parametersSZEDER Gábor1-12/+13
2019-12-06name-rev: restructure creating/updating 'struct rev_name' instancesSZEDER Gábor1-14/+21
2019-12-06name-rev: restructure parsing commits and applying date cutoffSZEDER Gábor1-13/+16
2019-12-06name-rev: pull out deref handling from the recursionSZEDER Gábor1-17/+10
2019-12-06name-rev: extract creating/updating a 'struct name_rev' into a helperSZEDER Gábor1-13/+27
2019-12-06t6120: add a test to cover inner conditions in 'git name-rev's name_rev()SZEDER Gábor1-0/+41
2019-12-06name-rev: use sizeof(*ptr) instead of sizeof(type) in allocationSZEDER Gábor1-1/+1
2019-12-06name-rev: avoid unnecessary cast in name_ref()SZEDER Gábor1-1/+1
2019-12-06name-rev: use strbuf_strip_suffix() in get_rev_name()René Scharfe1-4/+3
2019-12-06t6120-describe: modernize the 'check_describe' helperSZEDER Gábor1-6/+4
2019-12-06range-diff: clear `other_arg` at end of functionDenton Liu1-0/+1
2019-12-06range-diff: mark pointers as constDenton Liu2-5/+5
2019-12-06t3206: fix incorrect test nameDenton Liu1-1/+1
2019-12-06t9300-fast-import: don't hang if background fast-import exits too earlySZEDER Gábor1-2/+14
2019-12-06t9300-fast-import: store the PID in a variable instead of pidfileSZEDER Gábor1-3/+3
2019-12-06apply --allow-overlap: fix a corner caseJohannes Schindelin1-0/+10
2019-12-06git add -p: use non-zero exit code when the diff generation failedJohannes Schindelin2-4/+6
2019-12-06t3701: verify that the diff.algorithm config setting is handledJohannes Schindelin1-0/+10
2019-12-06t3701: verify the shown messages when nothing can be addedJohannes Schindelin1-0/+11
2019-12-06t3701: add a test for the different `add -p` promptsJohannes Schindelin1-1/+18
2019-12-06t3701: avoid depending on the TTY prerequisiteJohannes Schindelin1-7/+21
2019-12-06t3701: add a test for advanced split-hunk editingJohannes Schindelin1-0/+22
2019-12-06Git 2.24.1v2.24.1Johannes Schindelin3-2/+10
2019-12-06Sync with 2.23.1Johannes Schindelin46-87/+983
2019-12-06Git 2.23.1v2.23.1Johannes Schindelin3-2/+10
2019-12-06Sync with 2.22.2Johannes Schindelin45-87/+975
2019-12-06Git 2.22.2v2.22.2Johannes Schindelin3-2/+10
2019-12-06Sync with 2.21.1Johannes Schindelin44-87/+967
2019-12-06Git 2.21.1v2.21.1Johannes Schindelin3-2/+14
2019-12-06Merge branch 'fix-msys2-quoting-bugs'Johannes Schindelin1-5/+20
2019-12-06mingw: sh arguments need quoting in more circumstancesJohannes Schindelin1-2/+3
2019-12-06t7415: drop v2.20.x-specific work-aroundJohannes Schindelin1-1/+1
2019-12-06mingw: fix quoting of empty arguments for `sh`Johannes Schindelin1-1/+1
2019-12-06mingw: use MSYS2 quoting even when spawning shell scriptsJohannes Schindelin1-1/+2
2019-12-06mingw: detect when MSYS2's sh is to be spawned more robustlyJohannes Schindelin1-1/+14
2019-12-06Sync with 2.20.2Johannes Schindelin43-82/+935
2019-12-06Git 2.20.2v2.20.2Johannes Schindelin3-2/+20
2019-12-06submodule: defend against submodule.update = !command in .gitmodulesJonathan Nieder1-0/+2
2019-12-06t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.xJohannes Schindelin1-1/+1
2019-12-06Sync with 2.19.3Johannes Schindelin40-82/+914
2019-12-06Git 2.19.3v2.19.3Johannes Schindelin3-2/+10
2019-12-06Sync with 2.18.2Johannes Schindelin39-82/+906
2019-12-06Git 2.18.2v2.18.2Johannes Schindelin3-2/+10
2019-12-06Sync with 2.17.3Johannes Schindelin38-83/+898
2019-12-06Git 2.17.3v2.17.3Johannes Schindelin3-2/+14
2019-12-06fsck: reject submodule.update = !command in .gitmodulesJonathan Nieder2-0/+21
2019-12-06Sync with 2.16.6Johannes Schindelin37-82/+865
2019-12-06Git 2.16.6v2.16.6Johannes Schindelin3-2/+10
2019-12-06test-drop-caches: use `has_dos_drive_prefix()`Johannes Schindelin1-5/+8
2019-12-06Sync with 2.15.4Johannes Schindelin35-77/+842
2019-12-06Git 2.15.4v2.15.4Johannes Schindelin3-2/+13
2019-12-06submodule: reject submodule.update = !command in .gitmodulesJonathan Nieder3-11/+20
2019-12-06Sync with 2.14.6Johannes Schindelin31-66/+811
2019-12-06Git 2.14.6v2.14.6Johannes Schindelin3-2/+56
2019-12-05The third batchJunio C Hamano1-0/+81
2019-12-05Merge branch 'js/pkt-line-h-typofix'Junio C Hamano1-1/+1
2019-12-05Merge branch 'us/unpack-trees-fsmonitor'Junio C Hamano3-9/+29
2019-12-05Merge branch 'sg/test-bool-env'Junio C Hamano10-13/+84
2019-12-05Merge branch 'mh/clear-topo-walk-upon-reset'Junio C Hamano1-1/+17
2019-12-05Merge branch 'hv/assume-priumax-is-available-anywhere'Junio C Hamano1-20/+0
2019-12-05Merge branch 'mg/submodule-status-from-a-subdirectory'Junio C Hamano2-1/+24
2019-12-05Merge branch 'dl/t5520-cleanup'Junio C Hamano10-159/+238
2019-12-05Merge branch 'nl/reset-patch-takes-a-tree'Junio C Hamano2-1/+22
2019-12-05Merge branch 'mg/doc-submodule-status-cached'Junio C Hamano1-0/+3
2019-12-05Merge branch 'js/git-svn-use-rebase-merges'Junio C Hamano2-5/+7
2019-12-05Merge branch 'hi/gpg-optional-pkfp-fix'Junio C Hamano2-12/+52
2019-12-05Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits'Junio C Hamano2-5/+53
2019-12-05Merge branch 'jk/fail-show-toplevel-outside-working-tree'Junio C Hamano3-1/+14
2019-12-05Merge branch 'sg/unpack-progress-throughput'Junio C Hamano1-1/+2
2019-12-05Merge branch 'pb/submodule-update-fetches'Junio C Hamano1-1/+2
2019-12-05Merge branch 'jc/azure-ci-osx-fix-fix'Junio C Hamano1-1/+2