summaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorLines
2025-12-14Merge branch 'rs/diff-index-find-copies-harder-optim'Junio C Hamano-0/+20
2025-11-30Merge branch 'jc/whitespace-incomplete-line'Junio C Hamano-47/+98
2025-11-30diff-index: don't queue unchanged filepairs with diff_change()René Scharfe-0/+20
2025-11-26Merge branch 'ad/blame-diff-algorithm'Junio C Hamano-1/+0
2025-11-21Merge branch 'rs/diff-quiet-no-rename'Junio C Hamano-0/+2
2025-11-17xdiff: add 'minimal' to XDF_DIFF_ALGORITHM_MASKAntonin Delpeuch-1/+0
2025-11-12diff: highlight and error out on incomplete linesJunio C Hamano-2/+27
2025-11-12whitespace: allocate a few more bits and define WS_INCOMPLETE_LINEJunio C Hamano-8/+8
2025-11-12diff: update the way rewrite diff handles incomplete linesJunio C Hamano-15/+22
2025-11-12diff: call emit_callback ecbdata everywhereJunio C Hamano-6/+6
2025-11-12diff: refactor output of incomplete lineJunio C Hamano-2/+12
2025-11-12diff: keep track of the type of the last line seenJunio C Hamano-0/+11
2025-11-12diff: correct suppress_blank_empty hackJunio C Hamano-16/+11
2025-11-12diff: emit_line_ws_markup() if/else style fixJunio C Hamano-4/+4
2025-11-12whitespace: correct bit assignment commentsJunio C Hamano-2/+5
2025-11-10diff: disable rename detection with --quietRené Scharfe-0/+2
2025-10-24diff: simplify run_external_diff() quiet logicJeff King-3/+2
2025-10-24diff: drop dry-run redirection to /dev/nullJeff King-28/+3
2025-10-24diff: replace diff_options.dry_run flag with NULL fileJeff King-8/+8
2025-10-24diff: drop save/restore of color_moved in dry-run modeJeff King-4/+0
2025-10-24diff: send external diff output to diff_options.fileJeff King-1/+4
2025-10-24Merge branch 'jc/diff-from-contents-fix'Junio C Hamano-3/+23
2025-10-24Merge branch 'jk/diff-from-contents-fix'Junio C Hamano-0/+9
2025-10-23diff: stop output garbled message in dry run modeLidong Yan-2/+6
2025-10-23Merge branch 'jc/diff-from-contents-fix' into ly/diff-name-only-with-diff-fro...Junio C Hamano-3/+23
2025-10-23diff: make sure the other caller of diff_flush_patch_quietly() is silentJunio C Hamano-3/+23
2025-10-22Merge branch 'jk/diff-from-contents-fix' into ly/diff-name-only-with-diff-fro...Junio C Hamano-0/+9
2025-10-17diff: restore redirection to /dev/null for diff_from_contentsJeff King-0/+9
2025-09-29Merge branch 'jk/color-variable-fixes'Junio C Hamano-26/+22
2025-09-16color: use git_colorbool enum type to store colorboolsJeff King-3/+3
2025-09-16diff: stop passing ecbdata->use_color as booleanJeff King-3/+3
2025-09-16diff: pass o->use_color directly to fill_metainfo()Jeff King-1/+1
2025-09-16diff: don't use diff_options.use_color as a strict boolJeff King-3/+2
2025-09-16diff: simplify color_moved check when flushingJeff King-14/+11
2025-09-16color: use GIT_COLOR_* instead of numeric constantsJeff King-3/+3
2025-08-25Merge branch 'tc/diff-tree-max-depth'Junio C Hamano-0/+24
2025-08-22Merge branch 'ly/diff-name-only-with-diff-from-content'Junio C Hamano-14/+50
2025-08-08diff: ensure consistent diff behavior with ignore optionsLidong Yan-14/+50
2025-08-07diff: teach tree-diff a max-depth parameterJeff King-0/+24
2025-08-02diff: simplify parsing of diff.colormovedwsJunio C Hamano-13/+7
2025-08-02string-list: align string_list_split() with its _in_place() counterpartJunio C Hamano-1/+1
2025-07-01odb: rename `oid_object_info()`Patrick Steinhardt-9/+9
2025-07-01object-store: rename files to "odb.{c,h}"Patrick Steinhardt-1/+1
2025-05-08Merge branch 'js/diff-codeql-false-positive-workaround'Junio C Hamano-1/+1
2025-04-29diff: check range before dereferencing an array elementJohannes Schindelin-1/+1
2025-04-24Merge branch 'ps/parse-options-integers'Junio C Hamano-4/+9
2025-04-17global: use designated initializers for optionsPatrick Steinhardt-4/+9
2025-04-15object-store: merge "object-store-ll.h" and "object-store.h"Patrick Steinhardt-1/+1
2025-04-08Merge branch 'ps/object-wo-the-repository' into ps/object-file-cleanupJunio C Hamano-6/+8
2025-03-10hash: stop depending on `the_repository` in `null_oid()`Patrick Steinhardt-4/+4