aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
4 hoursThe fifteenth batchHEADmastermainJunio C Hamano1-0/+7
4 hoursMerge branch 'jk/core-comment-string'Junio C Hamano26-136/+182
4 hoursMerge branch 'rs/config-comment'Junio C Hamano12-46/+152
2 daysThe fourteenth batchJunio C Hamano1-0/+27
2 daysMerge branch 'bl/cherry-pick-empty'Junio C Hamano10-68/+286
2 daysMerge branch 'bl/pretty-shorthand-config-fix'Junio C Hamano2-17/+23
2 daysMerge branch 'rs/strbuf-expand-bad-format'Junio C Hamano5-26/+35
2 daysMerge branch 'rs/midx-use-strvec-pushf'Junio C Hamano1-6/+1
2 daysMerge branch 'pb/test-scripts-are-build-targets'Junio C Hamano1-0/+7
2 daysMerge branch 'ds/grep-doc-updates'Junio C Hamano2-15/+23
2 daysMerge branch 'az/grep-group-error-message-update'Junio C Hamano1-2/+2
2 daysMerge branch 'jc/release-notes-entry-experiment'Junio C Hamano1-0/+12
2 daysMerge branch 'jk/remote-helper-object-format-option-fix'Junio C Hamano4-20/+11
4 daysThe thirteenth batchJunio C Hamano1-0/+26
4 daysMerge branch 'ps/clone-with-includeif-onbranch'Junio C Hamano1-0/+12
4 daysMerge branch 'jk/rebase-apply-leakfix'Junio C Hamano2-3/+12
4 daysMerge branch 'ps/t7800-variable-interpolation-fix'Junio C Hamano2-20/+40
4 daysMerge branch 'ps/reftable-unit-test-nfs-workaround'Junio C Hamano1-1/+11
4 daysMerge branch 'jk/doc-remote-helpers-markup-fix'Junio C Hamano1-3/+3
4 daysMerge branch 'pb/advice-merge-conflict'Junio C Hamano9-25/+39
4 daysMerge branch 'ds/config-internal-whitespace-fix'Junio C Hamano3-21/+136
4 daysMerge branch 'jk/pretty-subject-cleanup'Junio C Hamano7-46/+38
4 daysMerge branch 'pw/checkout-conflict-errorfix'Junio C Hamano9-37/+139
8 daysThe twelfth batchJunio C Hamano1-0/+18
8 daysMerge branch 'jk/drop-hg-to-git'Junio C Hamano2-275/+0
8 daysMerge branch 'rs/t-prio-queue-fixes'Junio C Hamano1-7/+17
8 daysMerge branch 'bt/fuzz-config-parse'Junio C Hamano4-1/+36
8 daysMerge branch 'jc/show-untracked-false'Junio C Hamano6-30/+68
8 daysMerge branch 'ph/diff-src-dst-prefix-config'Junio C Hamano4-15/+67
8 daysMerge branch 'eb/hash-transition'Junio C Hamano62-349/+1844
9 daysconfig: add core.commentStringJeff King3-8/+27
10 daysSubmittingPatches: release-notes entry experimentJunio C Hamano1-0/+12
11 dayscherry-pick: add `--empty` for more robust redundant commit handlingBrian Lyles5-9/+133
11 dayscherry-pick: enforce `--keep-redundant-commits` incompatibilityBrian Lyles2-0/+15
11 dayssequencer: do not require `allow_empty` for redundant commit optionsBrian Lyles1-16/+7
11 dayssequencer: handle unborn branch with `--allow-empty`Brian Lyles2-18/+39
11 daysrebase: update `--empty=ask` to `--empty=stop`Brian Lyles3-18/+34
11 daysdocs: clean up `--empty` formatting in git-rebase(1) and git-am(1)Brian Lyles2-16/+29
11 daysdocs: address inaccurate `--empty` default with `--exec`Brian Lyles2-5/+43
11 daysThe eleventh batchJunio C Hamano1-0/+15
11 daysMerge branch 'bl/doc-key-val-sep-fix'Junio C Hamano1-7/+5
11 daysMerge branch 'bl/doc-config-fixes'Junio C Hamano1-2/+3
11 daysMerge branch 'ja/doc-formatting-fix'Junio C Hamano8-15/+17
11 daysMerge branch 'bb/sh-scripts-cleanup'Junio C Hamano37-97/+85
11 daysMerge branch 'jc/index-pack-fsck-levels'Junio C Hamano1-1/+1
11 daysMerge branch 'js/bugreport-no-suffix-fix'Junio C Hamano2-4/+12
11 daysMerge branch 'rj/restore-plug-leaks'Junio C Hamano5-30/+25
11 daysgrep docs: describe --no-index further and improve formatting a bitDragan Simic1-9/+17
11 daysgrep docs: describe --recurse-submodules further and improve formatting a bitDragan Simic2-6/+6
11 dayspretty: find pretty formats case-insensitivelyBrian Lyles2-1/+9
11 dayspretty: update tests to use `test_config`Brian Lyles1-16/+14
11 daysmidx: use strvec_pushf() for pack-objects base nameRené Scharfe1-6/+1
11 dayst/README: mention test files are make targetsPhilippe Blain1-0/+7
11 dayscat-file: use strbuf_expand_bad_format()René Scharfe1-8/+8
11 daysfactor out strbuf_expand_bad_format()René Scharfe4-18/+27
11 daysgrep: improve errors for unmatched ( and )Ahelenia Ziemiańska1-2/+2
2024-03-22rebase: use child_process_clear() to cleanJeff King2-3/+12
2024-03-22format-patch: fix leak of empty header stringJeff King1-1/+1
2024-03-22t/README: document how to loop around test casesPatrick Steinhardt1-0/+20
2024-03-22t7800: use single quotes for test bodiesPatrick Steinhardt1-20/+20
2024-03-22t7800: improve test descriptions with empty argumentsPatrick Steinhardt1-8/+8
2024-03-21config.txt: describe handling of whitespace furtherDragan Simic1-13/+15
2024-03-21t1300: add more tests for whitespace and inline commentsDragan Simic1-3/+111
2024-03-21config: really keep value-internal whitespace verbatimDragan Simic1-4/+9
2024-03-21config: minor addition of whitespaceDragan Simic1-1/+1
2024-03-21The tenth batchJunio C Hamano1-0/+35
2024-03-21Merge branch 'bb/t0006-negative-tz-offset'Junio C Hamano1-0/+8
2024-03-21Merge branch 'bb/iso-strict-utc'Junio C Hamano2-5/+10
2024-03-21Merge branch 'jw/doc-show-untracked-files-fix'Junio C Hamano1-1/+1
2024-03-21Merge branch 'dg/user-manual-hash-example'Junio C Hamano1-2/+34
2024-03-21Merge branch 'ja/doc-markup-fixes'Junio C Hamano4-48/+57
2024-03-21Merge branch 'pb/ci-win-artifact-names-fix'Junio C Hamano1-2/+2
2024-03-21Merge branch 'ps/reftable-reflog-iteration-perf'Junio C Hamano10-211/+154
2024-03-21Merge branch 'jc/safe-implicit-bare'Junio C Hamano2-5/+49
2024-03-21Merge branch 'fs/find-end-of-log-message-fix'Junio C Hamano2-2/+19
2024-03-21Merge branch 'ps/reftable-block-search-fix'Junio C Hamano2-1/+3
2024-03-21Merge branch 'ps/reftable-stack-tempfile'Junio C Hamano5-183/+178
2024-03-21Merge branch 'rs/opt-parse-long-fixups'Junio C Hamano3-64/+100
2024-03-21reftable: fix tests being broken by NFS' delete-after-close semanticsPatrick Steinhardt1-1/+11
2024-03-20contrib: drop hg-to-git scriptJeff King2-275/+0
2024-03-20transport-helper: send "true" value for object-format optionJeff King2-6/+5
2024-03-20transport-helper: drop "object-format <algo>" optionJeff King2-12/+4
2024-03-20transport-helper: use write helpers more consistentlyJeff King1-3/+3
2024-03-20doc/gitremote-helpers: fix more missing single-quotesJeff King1-3/+3
2024-03-19format-patch: simplify after-subject MIME header handlingJeff King1-8/+6
2024-03-19format-patch: return an allocated string from log_write_email_headers()Jeff King4-7/+9
2024-03-19log: do not set up extra_headers for non-email formatsJeff King1-3/+1
2024-03-19pretty: drop print_email_subject flagJeff King5-16/+9
2024-03-19pretty: split oneline and email subject printingJeff King3-15/+17
2024-03-19shortlog: stop setting pp.print_email_subjectJeff King1-1/+0
2024-03-18The ninth batchJunio C Hamano1-0/+8
2024-03-18Merge branch 'jk/doc-remote-helpers-markup-fix'Junio C Hamano1-1/+1
2024-03-18Merge branch 'jh/trace2-missing-def-param-fix'Junio C Hamano3-6/+246
2024-03-18Merge branch 'pw/rebase-i-ignore-cherry-pick-help-environment'Junio C Hamano3-12/+18
2024-03-18docs: adjust trailer `separator` and `key_value_separator` languageBrian Lyles1-7/+5
2024-03-18docs: correct trailer `key_value_separator` descriptionBrian Lyles1-2/+2
2024-03-18builtin/am: allow disabling conflict advicePhilippe Blain3-10/+14
2024-03-18sequencer: allow disabling conflict advicePhilippe Blain6-15/+25
2024-03-18t-prio-queue: check result array boundsRené Scharfe1-3/+11
2024-03-18t-prio-queue: shorten array index messageRené Scharfe1-4/+6
2024-03-18diff.*Prefix: use camelCase in the doc and test titlesJunio C Hamano2-25/+25
2024-03-16git-quiltimport: avoid an unnecessary subshellBeat Bolli1-1/+1
2024-03-16contrib/coverage-diff: avoid redundant pipelinesBeat Bolli1-7/+2
2024-03-16t/t9*: merge "grep | sed" pipelinesBeat Bolli3-3/+3
2024-03-16t/t8*: merge "grep | sed" pipelinesBeat Bolli1-14/+14
2024-03-16t/t5*: merge a "grep | sed" pipelineBeat Bolli1-1/+1
2024-03-16t/t4*: merge a "grep | sed" pipelineBeat Bolli1-1/+1
2024-03-16t/t3*: merge a "grep | awk" pipelineBeat Bolli1-1/+1
2024-03-16t/t1*: merge a "grep | sed" pipelineBeat Bolli1-1/+1
2024-03-16t/t9*: avoid redundant uses of catBeat Bolli6-33/+26
2024-03-16t/t8*: avoid redundant use of catBeat Bolli1-1/+1
2024-03-16t/t7*: avoid redundant use of catBeat Bolli1-1/+1
2024-03-16t/t6*: avoid redundant uses of catBeat Bolli2-3/+3
2024-03-16t/t5*: avoid redundant uses of catBeat Bolli3-3/+3
2024-03-16t/t4*: avoid redundant uses of catBeat Bolli3-6/+6
2024-03-16t/t3*: avoid redundant uses of catBeat Bolli3-6/+6
2024-03-16t/t1*: avoid redundant uses of catBeat Bolli2-4/+4
2024-03-16t/t0*: avoid redundant uses of catBeat Bolli4-5/+5
2024-03-16t/perf: avoid redundant use of catBeat Bolli1-1/+1
2024-03-16t/annotate-tests.sh: avoid redundant use of catBeat Bolli1-1/+1
2024-03-16t/lib-cvs.sh: avoid redundant use of catBeat Bolli1-2/+2
2024-03-16contrib/subtree/t: avoid redundant use of catBeat Bolli1-1/+1
2024-03-16doc: avoid redundant use of catBeat Bolli1-2/+2
2024-03-16doc: fix some placeholders formatingJean-Noël Avila4-8/+8
2024-03-16doc: format alternatives in synopsisJean-Noël Avila4-7/+9
2024-03-16docs: fix typo in git-config `--default`Brian Lyles1-1/+1
2024-03-16docs: clarify file options in git-config `--edit`Brian Lyles1-1/+2
2024-03-16bugreport.c: fix a crash in `git bugreport` with `--no-suffix` optionJiamu Sun2-4/+12
2024-03-15config: allow tweaking whitespace between value and commentJunio C Hamano5-20/+76
2024-03-15config: fix --comment formattingJunio C Hamano4-21/+38
2024-03-15The eighth batchJunio C Hamano1-0/+12
2024-03-15Merge branch 'hd/config-mak-os390'Junio C Hamano1-0/+12
2024-03-15Merge branch 'vm/t7301-use-test-path-helpers'Junio C Hamano1-245/+245
2024-03-15Merge branch 'jc/xwrite-cleanup'Junio C Hamano4-25/+9
2024-03-15Merge branch 'ag/t0010-modernize'Junio C Hamano1-16/+15
2024-03-15Merge branch 'as/option-names-in-messages'Junio C Hamano4-4/+4
2024-03-15Merge branch 'kh/branch-ref-syntax-advice'Junio C Hamano6-108/+128
2024-03-15config: add --comment option to add a commentRalph Seichter12-45/+78
2024-03-15fuzz: add fuzzer for config parsingBrian C Tracy4-1/+36
2024-03-15t5300: fix test_with_bad_commit()John Cai1-1/+1
2024-03-15diff: add diff.srcPrefix and diff.dstPrefix configuration variablesPeter Hutterer4-4/+56
2024-03-14The seventh batchJunio C Hamano1-0/+32
2024-03-14Merge branch 'rj/complete-worktree-paths-fix'Junio C Hamano2-1/+24
2024-03-14Merge branch 'rj/complete-reflog'Junio C Hamano2-12/+82
2024-03-14Merge branch 'jc/test-i18ngrep'Junio C Hamano1-2/+1
2024-03-14Merge branch 'gt/core-bare-in-templates'Junio C Hamano3-49/+8
2024-03-14Merge branch 'la/trailer-api'Junio C Hamano7-147/+204
2024-03-14Merge branch 'kh/doc-commentchar-is-a-byte'Junio C Hamano1-1/+1
2024-03-14Merge branch 'jh/fsmonitor-icase-corner-case-fix'Junio C Hamano6-56/+522
2024-03-14Merge branch 'ps/reftable-iteration-perf-part2'Junio C Hamano14-181/+175
2024-03-14Merge branch 'so/clean-dry-run-without-force'Junio C Hamano4-18/+18
2024-03-14checkout: plug some leaks in git-restoreRubén Justo5-30/+25
2024-03-14checkout: fix interaction between --conflict and --mergePhillip Wood2-3/+67
2024-03-14checkout: cleanup --conflict=<style> parsingPhillip Wood2-19/+38
2024-03-14merge options: add a conflict style memberPhillip Wood5-2/+12
2024-03-14merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood5-5/+6
2024-03-14xdiff-interface: refactor parsing of merge.conflictstylePhillip Wood2-11/+19
2024-03-14t0006: add more tests with a negative TZ offsetBeat Bolli1-0/+8
2024-03-13date: make "iso-strict" conforming for the UTC timezoneBeat Bolli2-5/+10
2024-03-13status: allow --untracked=false and friendsJunio C Hamano5-12/+39
2024-03-13status: unify parsing of --untracked= and status.showUntrackedFilesJunio C Hamano2-18/+29
2024-03-13doc: status.showUntrackedFiles does not take "false"Jonas Wunderlich1-1/+1
2024-03-12t5601: exercise clones with "includeIf.*.onbranch"Patrick Steinhardt1-0/+12
2024-03-12Documentation/user-manual.txt: example for generating object hashesDirk Gouders1-2/+34
2024-03-12config: allow multi-byte core.commentCharJeff King5-8/+27
2024-03-12environment: drop comment_line_char compatibility macroJeff King1-1/+0
2024-03-12wt-status: drop custom comment-char stringificationJeff King1-10/+3
2024-03-12sequencer: handle multi-byte comment characters when writing todo listJeff King1-1/+3
2024-03-12find multi-byte comment chars in unterminated buffersJeff King5-5/+18
2024-03-12find multi-byte comment chars in NUL-terminated stringsJeff King4-4/+4
2024-03-12prefer comment_line_str to comment_line_char for printingJeff King8-32/+32
2024-03-12strbuf: accept a comment string for strbuf_add_commented_lines()Jeff King8-31/+21
2024-03-12strbuf: accept a comment string for strbuf_commented_addf()Jeff King9-18/+24
2024-03-12strbuf: accept a comment string for strbuf_stripspace()Jeff King13-20/+20
2024-03-12environment: store comment_line_char as a stringJeff King4-5/+6
2024-03-12strbuf: avoid shadowing global comment_line_char nameJeff King2-12/+12
2024-03-12commit: refactor base-case of adjust_comment_line_char()Jeff King1-2/+3
2024-03-12strbuf: avoid static variables in strbuf_add_commented_lines()Jeff King1-3/+3
2024-03-12strbuf: simplify comment-handling in add_lines() helperJeff King1-14/+10
2024-03-12config: forbid newline as core.commentCharJeff King2-0/+7
2024-03-11The sixth batchJunio C Hamano1-0/+4
2024-03-11Merge branch 'sj/t9117-path-is-file'Junio C Hamano1-8/+8
2024-03-11Merge branch 'kh/doc-dashed-commands-have-not-worked-for-a-long-time'Junio C Hamano1-3/+0
2024-03-11Merge branch 'rs/t-ctype-simplify'Junio C Hamano1-54/+27
2024-03-11Merge branch 'es/config-doc-sort-sections'Junio C Hamano1-14/+14
2024-03-11Merge branch 'js/merge-base-with-missing-commit'Junio C Hamano29-188/+460
2024-03-11setup: notice more types of implicit bare repositoriesJunio C Hamano2-5/+49
2024-03-11ci(github): make Windows test artifacts name uniquePhilippe Blain1-2/+2
2024-03-11doc: git-clone: format placeholdersJean-Noël Avila2-15/+15
2024-03-11doc: git-clone: format verbatim wordsJean-Noël Avila2-6/+6
2024-03-11doc: git-init: rework config item init.templateDirJean-Noël Avila2-3/+8
2024-03-11doc: git-init: rework definition listsJean-Noël Avila1-4/+8
2024-03-11doc: git-init: format placeholdersJean-Noël Avila1-5/+5
2024-03-11doc: git-init: format verbatim partsJean-Noël Avila1-16/+16
2024-03-09merge-ort/merge-recursive: do report errors in `merge_submodule()`Johannes Schindelin2-0/+13
2024-03-09merge-recursive: prepare for `merge_submodule()` to report errorsJohannes Schindelin1-6/+7
2024-03-07The fifth batchJunio C Hamano1-0/+34
2024-03-07Merge branch 'ps/remote-helper-repo-initialization-fix'Junio C Hamano3-1/+59
2024-03-07Merge branch 'jk/upload-pack-v2-capability-cleanup'Junio C Hamano2-32/+45
2024-03-07Merge branch 'jk/upload-pack-bounded-resources'Junio C Hamano10-73/+113