summaryrefslogtreecommitdiff
AgeCommit message (Expand)AuthorFilesLines
2024-03-15format_trailer_info(): append newline for non-trailer linesLinus Arver3-22/+11
2024-03-15format_trailer_info(): drop redundant unfold_value()Linus Arver1-3/+0
2024-03-15format_trailer_info(): use trailer_item objectsLinus Arver3-19/+30
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