aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2015-07-15Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano1-1/+6
2015-07-12diff: parse ws-error-highlight option more strictlyRené Scharfe1-1/+6
2015-06-11Merge branch 'jk/color-diff-plain-is-context'Junio C Hamano1-15/+15
2015-06-11Merge branch 'jc/diff-ws-error-highlight'Junio C Hamano1-22/+100
2015-05-27diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXTJeff King1-13/+13
2015-05-27diff: accept color.diff.context as a synonym for "plain"Jeff King1-1/+1
2015-05-26diff.c: --ws-error-highlight=<kind> optionJunio C Hamano1-16/+68
2015-05-26diff.c: add emit_del_line() and emit_context_line()Junio C Hamano1-12/+38
2015-03-17Merge branch 'rs/deflate-init-cleanup'Junio C Hamano1-1/+0
2015-03-06Merge branch 'mk/diff-shortstat-dirstat-fix'Junio C Hamano1-1/+1
2015-03-05zlib: initialize git_zstream in git_deflate_init{,_gzip,_raw}René Scharfe1-1/+0
2015-03-02diff --shortstat --dirstat: remove duplicate outputMårten Kongstad1-1/+1
2014-10-20Merge branch 'jn/parse-config-slot'Junio C Hamano1-2/+1
2014-10-14color_parse: do not mention variable name in error messageJeff King1-2/+1
2014-09-11Merge branch 'nd/large-blobs'Junio C Hamano1-14/+38
2014-08-20run-command: introduce CHILD_PROCESS_INITRené Scharfe1-2/+1
2014-08-18diff: shortcut for diff'ing two binary SHA-1 objectsNguyễn Thái Ngọc Duy1-0/+13
2014-08-18diff --stat: mark any file larger than core.bigfilethreshold binaryNguyễn Thái Ngọc Duy1-8/+18
2014-08-18diff.c: allow to pass more flags to diff_populate_filespecNguyễn Thái Ngọc Duy1-6/+7
2014-07-22Merge branch 'bg/xcalloc-nmemb-then-size' into maintJunio C Hamano1-1/+1
2014-07-17strbuf: use strbuf_addstr() for adding C stringsRené Scharfe1-6/+6
2014-06-25Merge branch 'jk/diff-follow-must-take-one-pathspec' into maintJunio C Hamano1-0/+3
2014-06-20stat_opt: check extra strlen callJeff King1-1/+2
2014-06-20use skip_prefix to avoid repeating stringsJeff King1-18/+9
2014-06-20use skip_prefix to avoid magic numbersJeff King1-31/+34
2014-06-18parse_diff_color_slot: drop ofs parameterJeff King1-10/+10
2014-06-16Merge branch 'bg/xcalloc-nmemb-then-size'Junio C Hamano1-1/+1
2014-06-16Merge branch 'jk/diff-follow-must-take-one-pathspec'Junio C Hamano1-0/+3
2014-06-03Merge branch 'jk/external-diff-use-argv-array'Junio C Hamano1-31/+25
2014-06-03Merge branch 'ks/tree-diff-nway'Junio C Hamano1-0/+2
2014-05-27diff.c: rearrange xcalloc argumentsBrian Gesiak1-1/+1
2014-05-20move "--follow needs one pathspec" rule to diff_setup_doneJeff King1-0/+3
2014-04-28Merge branch 'jk/external-diff-use-argv-array' (early part)Junio C Hamano1-16/+16
2014-04-21run_external_diff: refactor cmdline setup logicJeff King1-11/+15
2014-04-21run_external_diff: hoist common bits out of conditionalJeff King1-5/+3
2014-04-21run_external_diff: drop fflush(NULL)Jeff King1-1/+0
2014-04-21run_external_diff: clean up error handlingJeff King1-6/+3
2014-04-21run_external_diff: use an argv_array for the environmentJeff King1-9/+5
2014-04-21run_external_diff: use an argv_array for the command lineJeff King1-16/+16
2014-04-17i18n: remove obsolete comments for translators in diffstat generationJiang Xin1-8/+0
2014-04-08Merge branch 'jl/nor-or-nand-and'Junio C Hamano1-1/+1
2014-04-07combine-diff: speed it up, by using multiparent diff tree-walker directlyKirill Smelkov1-0/+1
2014-04-07tree-diff: rework diff_tree() to generate diffs for multiparent cases as wellKirill Smelkov1-0/+1
2014-03-31comments: fix misuses of "nor"Justin Lebar1-1/+1
2014-03-18Merge branch 'tr/diff-submodule-no-reuse-worktree' into maintJunio C Hamano1-2/+3
2014-03-18Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano1-24/+43
2014-03-18Merge branch 'rm/strchrnul-not-strlen'Junio C Hamano1-6/+3
2014-03-18Merge branch 'dd/use-alloc-grow'Junio C Hamano1-10/+2
2014-03-14Merge branch 'tr/diff-submodule-no-reuse-worktree'Junio C Hamano1-2/+3
2014-03-10use strchrnul() in place of strchr() and strlen()Rohit Mani1-6/+3
2014-03-07Merge branch 'jc/hold-diff-remove-q-synonym-for-no-deletion'Junio C Hamano1-8/+0
2014-03-03diff.c: use ALLOC_GROW()Dmitry S. Dolzhenko1-10/+2
2014-02-27Merge branch 'nd/diff-quiet-stat-dirty'Junio C Hamano1-24/+43
2014-02-24diff: do not quit early on stat-dirty filesNguyễn Thái Ngọc Duy1-5/+17
2014-02-24diff.c: move diffcore_skip_stat_unmatch core logic out for reuse laterNguyễn Thái Ngọc Duy1-21/+28
2014-02-18diff: do not reuse_worktree_file for submodulesThomas Rast1-2/+3
2014-01-27Merge branch 'jk/diff-filespec-cleanup'Junio C Hamano1-2/+2
2014-01-17diff_filespec: drop xfrm_flags fieldJeff King1-2/+2
2014-01-10Merge branch 'sb/diff-orderfile-config'Junio C Hamano1-0/+5
2013-12-27Merge branch 'zk/difftool-counts'Junio C Hamano1-3/+17
2013-12-18diff: add diff.orderfile configuration variableSamuel Bronson1-0/+5
2013-12-17Merge branch 'cc/starts-n-ends-with'Junio C Hamano1-28/+28
2013-12-16diff.c: fix some recent whitespace style violationsJeff King1-2/+2
2013-12-06difftool: display the number of files in the diff queue in the promptZoltan Klinger1-3/+17
2013-12-05replace {pre,suf}fixcmp() with {starts,ends}_with()Christian Couder1-28/+28
2013-10-31Use the word 'stuck' instead of 'sticked'Nicolas Vigier1-1/+1
2013-10-23Merge branch 'mg/more-textconv'Junio C Hamano1-0/+3
2013-09-09Merge branch 'jc/diff-filter-negation'Junio C Hamano1-21/+104
2013-08-09diff: fix a possible null pointer dereferenceStefan Beller1-1/+1
2013-08-09diff: remove ternary operator evaluating always to trueStefan Beller1-2/+2
2013-07-24Merge branch 'ob/typofixes'Junio C Hamano1-1/+1
2013-07-24Merge branch 'sb/misc-fixes'Junio C Hamano1-3/+1
2013-07-22typofix: in-code commentsOndřej Bílka1-1/+1
2013-07-22Merge branch 'nd/const-struct-cache-entry'Junio C Hamano1-1/+1
2013-07-22Merge branch 'mm/diff-no-patch-synonym-to-s'Junio C Hamano1-12/+18
2013-07-19diff: remove "diff-files -q" in a version of Git in a distant futureJunio C Hamano1-8/+0
2013-07-19diff: deprecate -q option to diff-filesJunio C Hamano1-0/+8
2013-07-17diff: allow --patch & cie to override -s/--no-patchMatthieu Moy1-11/+17
2013-07-17diff: allow --no-patch as synonym for -sMatthieu Moy1-1/+1
2013-07-17diff: allow lowercase letter to specify what change class to excludeJunio C Hamano1-1/+28
2013-07-17diff: reject unknown change class given to --diff-filterJunio C Hamano1-1/+1
2013-07-17diff: preparse --diff-filter string argumentJunio C Hamano1-7/+56
2013-07-17diff: factor out match_filter()Junio C Hamano1-16/+13
2013-07-17diff: pass the whole diff_options to diffcore_apply_filter()Junio C Hamano1-2/+4
2013-07-15diff.c: Do not initialize a variable, which gets reassigned anyway.Stefan Beller1-3/+1
2013-07-11Merge branch 'jc/maint-diff-core-safecrlf'Junio C Hamano1-1/+9
2013-07-09Convert "struct cache_entry *" to "const ..." wherever possibleNguyễn Thái Ngọc Duy1-1/+1
2013-06-25diff: demote core.safecrlf=true to core.safecrlf=warnJunio C Hamano1-1/+9
2013-06-19diff: add --ignore-blank-lines optionAntoine Pelisse1-0/+2
2013-05-10diff_opt: track whether flags have been set explicitlyJunio C Hamano1-0/+3
2013-04-24Merge branch 'jk/diff-algo-finishing-touches' into maintJunio C Hamano1-2/+3
2013-04-15Merge branch 'jk/diff-graph-submodule-summary'Junio C Hamano1-0/+1
2013-04-15Merge branch 'jk/diff-algo-finishing-touches'Junio C Hamano1-2/+3
2013-04-12Correct common spelling mistakes in comments and testsStefano Lattarini1-1/+1
2013-04-05submodule: print graph output next to submodule logJohn Keeping1-0/+1
2013-04-05diff: allow unstuck arguments with --diff-algorithmJohn Keeping1-2/+3
2013-04-01Merge branch 'ap/maint-diff-rename-avoid-overlap' into maintJunio C Hamano1-1/+13
2013-03-25Merge branch 'ap/maint-diff-rename-avoid-overlap'Junio C Hamano1-1/+13
2013-03-21diff.c: diff.renamelimit => diff.renameLimit in messageMax Nanasy1-1/+1
2013-02-26diff: prevent pprint_rename from underrunning inputThomas Rast1-7/+10
2013-02-23diff: Fix rename pretty-print when suffix and prefix overlapAntoine Pelisse1-1/+10
2013-02-17Merge branch 'mp/diff-algo-config'Junio C Hamano1-0/+34
2013-02-14Merge branch 'jk/diff-graph-cleanup'Junio C Hamano1-97/+34
2013-02-12diff.c: use diff_line_prefix() where applicableJohn Keeping1-95/+20
2013-02-12diff: add diff_line_prefix functionJohn Keeping1-0/+10
2013-02-12diff.c: make constant string arguments constJohn Keeping1-2/+4
2013-02-12diff: write prefix to the correct fileJohn Keeping1-1/+1
2013-01-16diff: Introduce --diff-algorithm command line optionMichal Privoznik1-1/+11
2013-01-16config: Introduce diff.algorithm variableMichal Privoznik1-0/+24
2013-01-14Merge branch 'jc/blame-no-follow'Junio C Hamano1-0/+2
2012-11-29Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano1-25/+29
2012-11-27diff --shortstat: do not count "unmerged" entriesJunio C Hamano1-3/+2
2012-11-27diff --stat: do not count "unmerged" entriesJunio C Hamano1-2/+4
2012-11-27diff --stat: move the "total count" logic to the last loopJunio C Hamano1-9/+12
2012-11-27diff --stat: use "file" temporary variable to refer to data->files[i]Junio C Hamano1-13/+13
2012-11-27diff --stat: status of unmodified pair in diff-q is not zeroJunio C Hamano1-1/+1
2012-11-25Merge branch 'rr/submodule-diff-config'Junio C Hamano1-11/+35
2012-11-25Merge branch 'lt/diff-stat-show-0-lines'Junio C Hamano1-10/+15
2012-11-18submodule: display summary header in boldRamkumar Ramachandra1-1/+1
2012-11-18diff: rename "set" variableJeff King1-6/+6
2012-11-18diff: introduce diff.submodule configuration variableRamkumar Ramachandra1-4/+28
2012-11-09Merge branch 'nd/builtin-to-libgit'Jeff King1-0/+16
2012-11-09Merge branch 'mh/maint-parse-dirstat-fix'Jeff King1-19/+21
2012-10-29Move setup_diff_pager to libgit.aNguyễn Thái Ngọc Duy1-0/+16
2012-10-29parse_dirstat_params(): use string_list to split comma-separated stringMichael Haggerty1-19/+21
2012-10-17Fix "git diff --stat" for interesting - but empty - file changesLinus Torvalds1-10/+15
2012-09-30diff: diff.context configuration gives default to -UJeff Muizelaar1-1/+8
2012-09-21diff: accept --no-follow optionJunio C Hamano1-0/+2
2012-09-20Merge branch 'nd/maint-diffstat-summary' into maintJunio C Hamano1-6/+4
2012-09-18Merge branch 'jc/make-static'Junio C Hamano1-1/+1
2012-09-17Merge branch 'nd/maint-diffstat-summary'Junio C Hamano1-6/+4
2012-09-15diff.c: mark a private file-scope symbol as staticJunio C Hamano1-1/+1
2012-09-14Revert diffstat back to EnglishNguyễn Thái Ngọc Duy1-6/+4
2012-09-11Sync with 1.7.11.6Junio C Hamano1-3/+2
2012-09-11Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11Junio C Hamano1-0/+1
2012-09-11Merge branch 'tr/void-diff-setup-done' into maint-1.7.11Junio C Hamano1-3/+1
2012-09-10Merge branch 'maint-1.7.11' into maintJunio C Hamano1-6/+10
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano1-6/+10
2012-08-27Merge branch 'ab/diff-write-incomplete-line'Junio C Hamano1-0/+1
2012-08-27Merge branch 'jk/maint-null-in-trees'Junio C Hamano1-6/+10
2012-08-22Merge branch 'tr/void-diff-setup-done'Junio C Hamano1-3/+1
2012-08-05Fix '\ No newline...' annotation in rewrite diffsAdam Butcher1-0/+1
2012-08-03diff_setup_done(): return voidThomas Rast1-3/+1
2012-07-31Merge branch 'nd/maint-i18n-diffstat'Junio C Hamano1-1/+1
2012-07-30Merge branch 'jv/maint-no-ext-diff' into maintJunio C Hamano1-3/+5
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King1-6/+10
2012-07-26i18n: leave \n out of translated diffstatNguyễn Thái Ngọc Duy1-1/+1
2012-07-23Merge branch 'jv/maint-no-ext-diff'Junio C Hamano1-3/+5
2012-07-22Merge branch 'jc/refactor-diff-stdin' into maintJunio C Hamano1-20/+1
2012-07-17diff: correctly disable external_diff with --no-ext-diffJunio C Hamano1-3/+5
2012-07-13Merge branch 'jc/refactor-diff-stdin'Junio C Hamano1-20/+1
2012-06-28diff-index.c: "git diff" has no need to read blob from the standard inputJunio C Hamano1-20/+1
2012-06-15Merge branch 'as/diff-shortstat-ignore-binary'Junio C Hamano1-1/+1
2012-06-15diff: Only count lines in show_shortstatsAlexander Strasser1-1/+1
2012-05-07Merge branch 'zj/diff-empty-chmod'Junio C Hamano1-16/+27
2012-05-02Merge branch 'zj/diff-stat-smaller-num-columns'Junio C Hamano1-10/+38
2012-05-02Merge branch 'lp/diffstat-with-graph'Junio C Hamano1-2/+6
2012-05-01diff --stat: do not run diff on indentical filesZbigniew Jędrzejewski-Szmek1-2/+5
2012-05-01diff --stat: report mode-only changes for binary files like text filesZbigniew Jędrzejewski-Szmek1-15/+23
2012-04-30diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek1-10/+38
2012-04-23Merge branch 'lp/maint-diff-three-dash-with-graph'Junio C Hamano1-0/+6
2012-04-18Prevent graph_width of stat width from falling below minLucian Poston1-1/+5
2012-04-16Merge branch 'jk/diff-no-rename-empty'Junio C Hamano1-0/+5
2012-04-16Adjust stat width calculations to take --graph output into accountLucian Poston1-1/+1
2012-04-15Merge branch 'tr/maint-word-diff-regex-sticky'Junio C Hamano1-56/+66
2012-04-15Merge branch 'jc/diff-algo-cleanup'Junio C Hamano1-2/+2
2012-03-23teach diffcore-rename to optionally ignore empty contentJeff King1-0/+5
2012-03-20log --graph: fix break in graph linesLucian Poston1-0/+6
2012-03-14diff: tweak a _copy_ of diff_options with word-diffThomas Rast1-1/+4
2012-03-14diff: refactor the word-diff setup from builtin_diff_cmdThomas Rast1-56/+63
2012-03-12Merge branch 'jc/maint-diff-patch-header' into maintJunio C Hamano1-1/+1
2012-03-06Merge branch 'jc/maint-diff-patch-header'Junio C Hamano1-1/+1
2012-03-06Merge branch 'zj/diff-stat-dyncol'Junio C Hamano1-27/+87
2012-03-01diff -p: squelch "diff --git" header for stat-dirty pathsJunio C Hamano1-1/+1
2012-03-01diff --stat: add config option to limit graph widthZbigniew Jędrzejewski-Szmek1-0/+8
2012-03-01diff --stat: enable limiting of the graph partZbigniew Jędrzejewski-Szmek1-2/+21
2012-03-01diff --stat: use a maximum of 5/8 for the filename partZbigniew Jędrzejewski-Szmek1-30/+60
2012-03-01diff --stat: use the full terminal widthZbigniew Jędrzejewski-Szmek1-1/+4
2012-02-24Merge branches zj/decimal-width, zj/term-columns and jc/diff-stat-scalerJunio C Hamano1-7/+20
2012-02-21Merge branch 'jc/diff-stat-scaler' into maintJunio C Hamano1-7/+20
2012-02-20Merge branch 'jc/diff-stat-scaler'Junio C Hamano1-7/+20
2012-02-19xdiff: PATIENCE/HISTOGRAM are not independent option bitsJunio C Hamano1-2/+2
2012-02-14diff --stat: show bars of same length for paths with same amount of changesJunio C Hamano1-7/+20
2012-02-14Merge branch 'jk/userdiff-config-simplify'Junio C Hamano1-5/+2
2012-02-07drop odd return value semantics from userdiff_configJeff King1-5/+2
2012-02-03Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy1-5/+51
2012-01-18Merge branch 'tr/maint-word-diff-incomplete-line'Junio C Hamano1-0/+9
2012-01-12word-diff: ignore '\ No newline at eof' markerThomas Rast1-0/+9
2011-11-01Merge branch 'jc/maint-diffstat-numstat-context' into maintJunio C Hamano1-0/+2
2011-10-21Merge branch 'rs/diff-cleanup-records-fix' into maintJunio C Hamano1-0/+4
2011-10-19Merge branch 'rs/diff-whole-function'Junio C Hamano1-0/+8
2011-10-13Merge branch 'rs/diff-cleanup-records-fix'Junio C Hamano1-0/+4
2011-10-10Merge branch 'jc/maint-diffstat-numstat-context'Junio C Hamano1-0/+2
2011-10-10diff: add option to show whole functions as contextRené Scharfe1-0/+8
2011-10-03diff: resurrect XDF_NEED_MINIMAL with --minimalJunio C Hamano1-0/+4
2011-09-22diff: teach --stat/--numstat to honor -U$numJunio C Hamano1-0/+2
2011-08-28Merge branch 'jk/color-and-pager'Junio C Hamano1-28/+25
2011-08-19diff: don't load color config in plumbingJeff King1-1/+4
2011-08-19color: delay auto-color decision until point of useJeff King1-10/+7
2011-08-18git_config_colorbool: refactor stdout_is_tty handlingJeff King1-2/+2
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-08 09:31:41 +0000