summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorLines
2024-03-15Merge branch 'jc/xwrite-cleanup'Junio C Hamano-25/+9
2024-03-15Merge branch 'ag/t0010-modernize'Junio C Hamano-16/+15
2024-03-15Merge branch 'as/option-names-in-messages'Junio C Hamano-4/+4
2024-03-15Merge branch 'kh/branch-ref-syntax-advice'Junio C Hamano-108/+128
2024-03-15config: add --comment option to add a commentRalph Seichter-45/+78
2024-03-15fuzz: add fuzzer for config parsingBrian C Tracy-1/+36
2024-03-15trailer: finish formatting unificationLinus Arver-16/+9
2024-03-15trailer: begin formatting unificationLinus Arver-39/+19
2024-03-15format_trailer_info(): append newline for non-trailer linesLinus Arver-22/+11
2024-03-15format_trailer_info(): drop redundant unfold_value()Linus Arver-3/+0
2024-03-15format_trailer_info(): use trailer_item objectsLinus Arver-19/+30
2024-03-15t5300: fix test_with_bad_commit()John Cai-1/+1
2024-03-15diff: add diff.srcPrefix and diff.dstPrefix configuration variablesPeter Hutterer-4/+56
2024-03-14The seventh batchJunio C Hamano-0/+32
2024-03-14Merge branch 'rj/complete-worktree-paths-fix'Junio C Hamano-1/+24
2024-03-14Merge branch 'rj/complete-reflog'Junio C Hamano-12/+82
2024-03-14Merge branch 'jc/test-i18ngrep'Junio C Hamano-2/+1
2024-03-14Merge branch 'gt/core-bare-in-templates'Junio C Hamano-49/+8
2024-03-14Merge branch 'la/trailer-api'Junio C Hamano-147/+204
2024-03-14Merge branch 'kh/doc-commentchar-is-a-byte'Junio C Hamano-1/+1
2024-03-14Merge branch 'jh/fsmonitor-icase-corner-case-fix'Junio C Hamano-56/+522
2024-03-14Merge branch 'ps/reftable-iteration-perf-part2'Junio C Hamano-181/+175
2024-03-14Merge branch 'so/clean-dry-run-without-force'Junio C Hamano-18/+18
2024-03-14checkout: plug some leaks in git-restoreRubén Justo-30/+25
2024-03-14checkout: fix interaction between --conflict and --mergePhillip Wood-3/+67
2024-03-14checkout: cleanup --conflict=<style> parsingPhillip Wood-19/+38
2024-03-14merge options: add a conflict style memberPhillip Wood-2/+12
2024-03-14merge-ll: introduce LL_MERGE_OPTIONS_INITPhillip Wood-5/+6
2024-03-14xdiff-interface: refactor parsing of merge.conflictstylePhillip Wood-11/+19
2024-03-14t0006: add more tests with a negative TZ offsetBeat Bolli-0/+8
2024-03-13date: make "iso-strict" conforming for the UTC timezoneBeat Bolli-5/+10
2024-03-13status: allow --untracked=false and friendsJunio C Hamano-12/+39
2024-03-13status: unify parsing of --untracked= and status.showUntrackedFilesJunio C Hamano-18/+29
2024-03-13doc: status.showUntrackedFiles does not take "false"Jonas Wunderlich-1/+1
2024-03-12t5601: exercise clones with "includeIf.*.onbranch"Patrick Steinhardt-0/+12
2024-03-12Documentation/user-manual.txt: example for generating object hashesDirk Gouders-2/+34
2024-03-12config: allow multi-byte core.commentCharJeff King-8/+27
2024-03-12environment: drop comment_line_char compatibility macroJeff King-1/+0
2024-03-12wt-status: drop custom comment-char stringificationJeff King-10/+3
2024-03-12sequencer: handle multi-byte comment characters when writing todo listJeff King-1/+3
2024-03-12find multi-byte comment chars in unterminated buffersJeff King-5/+18
2024-03-12find multi-byte comment chars in NUL-terminated stringsJeff King-4/+4
2024-03-12prefer comment_line_str to comment_line_char for printingJeff King-32/+32
2024-03-12strbuf: accept a comment string for strbuf_add_commented_lines()Jeff King-31/+21
2024-03-12strbuf: accept a comment string for strbuf_commented_addf()Jeff King-18/+24
2024-03-12strbuf: accept a comment string for strbuf_stripspace()Jeff King-20/+20
2024-03-12environment: store comment_line_char as a stringJeff King-5/+6
2024-03-12strbuf: avoid shadowing global comment_line_char nameJeff King-12/+12
2024-03-12commit: refactor base-case of adjust_comment_line_char()Jeff King-2/+3
2024-03-12strbuf: avoid static variables in strbuf_add_commented_lines()Jeff King-3/+3