aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
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-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
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King1-22/+19
2011-08-17Merge branch 'rc/histogram-diff'Junio C Hamano1-0/+2
2011-08-16Merge branch 'jc/zlib-wrap' into maintJunio C Hamano1-5/+5
2011-08-16Merge branch 'jk/combine-diff-binary-etc' into maintJunio C Hamano1-13/+1
2011-07-19Merge branch 'jc/zlib-wrap'Junio C Hamano1-5/+5
2011-07-12teach --histogram to diffTay Ray Chuan1-0/+2
2011-06-29Merge branch 'mg/diff-stat-count'Junio C Hamano1-9/+45
2011-06-29Merge branch 'jk/combine-diff-binary-etc'Junio C Hamano1-13/+1
2011-06-10zlib: zlib can only process 4GB at a timeJunio C Hamano1-1/+1
2011-06-10zlib: wrap deflateBound() tooJunio C Hamano1-1/+1
2011-06-10zlib: wrap deflate side of the APIJunio C Hamano1-3/+3
2011-06-06Merge branch 'jk/diff-not-so-quick'Junio C Hamano1-0/+7
2011-05-31Merge branch 'jc/rename-degrade-cc-to-c' into maintJunio C Hamano1-0/+26
2011-05-31diff: futureproof "stop feeding the backend early" logicJunio C Hamano1-0/+7
2011-05-27diff --stat-count: finishing touchesJunio C Hamano1-2/+4
2011-05-27diff: introduce --stat-lines to limit the stat linesMichael J Gruber1-4/+34
2011-05-27diff.c: omit hidden entries from namelen calculation with --statMichael J Gruber1-5/+9
2011-05-26Merge branch 'jm/maint-diff-words-with-sbe' into maintJunio C Hamano1-2/+10
2011-05-23refactor get_textconv to not require diff_filespecJeff King1-13/+1
2011-05-23Merge branch 'jm/maint-diff-words-with-sbe'Junio C Hamano1-2/+10
2011-05-20do not read beyond end of malloc'd bufferJim Meyering1-2/+10
2011-05-13Merge branch 'jh/dirstat-lines'Junio C Hamano1-19/+152
2011-05-13Merge branch 'jc/fix-diff-files-unmerged' into maintJunio C Hamano1-6/+6
2011-05-06Merge branch 'jc/fix-diff-files-unmerged'Junio C Hamano1-6/+6
2011-05-04Merge branch 'jh/dirstat' into maintJunio C Hamano1-5/+37
2011-04-29Mark dirstat error messages for translationJohan Herland1-4/+4
2011-04-29Improve error handling when parsing dirstat parametersJohan Herland1-30/+41
2011-04-29New --dirstat=lines mode, doing dirstat analysis based on diffstatJohan Herland1-2/+59
2011-04-29Allow specifying --dirstat cut-off percentage as a floating point numberJohan Herland1-10/+16
2011-04-29Add config variable for specifying default --dirstat behaviorJohan Herland1-1/+9
2011-04-29Refactor --dirstat parsing; deprecate --cumulative and --dirstat-by-fileJohan Herland1-9/+60
2011-04-29Make --dirstat=0 output directories that contribute < 0.1% of changesJohan Herland1-2/+2
2011-04-28Merge branch 'jc/diff-irreversible-delete'Junio C Hamano1-5/+14
2011-04-28Merge branch 'jc/rename-degrade-cc-to-c'Junio C Hamano1-0/+26
2011-04-28Merge branch 'jh/dirstat'Junio C Hamano1-5/+37
2011-04-23diff: remove often unused parameters from diff_unmerge()Junio C Hamano1-4/+1
2011-04-23diff.c: return filepair from diff_unmerge()Junio C Hamano1-5/+8
2011-04-12--dirstat: In case of renames, use target filename instead of source filenameJohan Herland1-1/+1
2011-04-11Teach --dirstat not to completely ignore rearranged lines within a fileJohan Herland1-1/+18
2011-04-11--dirstat-by-file: Make it faster and more correctJohan Herland1-5/+20
2011-04-02git diff -D: omit the preimage of deletesJunio C Hamano1-5/+14
2011-03-22diffcore-rename: fall back to -C when -C -C busts the rename limitJunio C Hamano1-0/+26
2011-03-22Remove unused variablesJohannes Schindelin1-2/+1
2011-03-22Fix sparse warningsStephen Boyd1-1/+1
2011-03-19Merge branch 'jk/merge-rename-ux'Junio C Hamano1-1/+1
2011-03-16Merge branch 'jk/diffstat-binary' into maintJunio C Hamano1-10/+21
2011-03-16standardize brace placement in struct definitionsJonathan Nieder1-4/+2
2011-02-22diff: don't retrieve binary blobs for diffstatJeff King1-4/+11
2011-02-22diff: handle diffstat of rewritten binary filesJeff King1-10/+14
2011-02-21bump rename limit defaults (again)Jeff King1-1/+1
2010-12-21Merge branch 'ks/blame-worktree-textconv-cached'Junio C Hamano1-2/+2
2010-12-19fill_textconv(): Don't get/put cache if sha1 is not validKirill Smelkov1-2/+2
2010-12-16Merge branch 'kb/diff-C-M-synonym'Junio C Hamano1-8/+8
2010-12-10diff: use "find" instead of "detect" as prefix for long forms of -M and -CYann Dirson1-9/+9
2010-12-09Merge branch 'np/diff-in-corrupt-repository' into maintJunio C Hamano1-2/+6
2010-12-09Merge branch 'cm/diff-check-at-eol' into maintJunio C Hamano1-1/+1
2010-12-08Merge branch 'jk/diff-CBM'Junio C Hamano1-3/+3
2010-11-29Merge branch 'np/diff-in-corrupt-repository'Junio C Hamano1-2/+6
2010-11-29Merge branch 'cm/diff-check-at-eol'Junio C Hamano1-1/+1
2010-11-29diff: add --detect-copies-harder as a synonym for --find-copies-harderKevin Ballard1-1/+1
2010-11-24Merge branch 'cb/diff-fname-optim' into maintJunio C Hamano1-1/+1
2010-11-24Merge branch 'jk/no-textconv-symlink' into maintJunio C Hamano1-3/+8
2010-11-17Merge branch 'cb/diff-fname-optim'Junio C Hamano1-1/+1
2010-11-17Merge branch 'jk/no-textconv-symlink'Junio C Hamano1-3/+8
2010-10-26Merge branch 'kb/merge-recursive-rename-threshold'Junio C Hamano1-6/+25
2010-10-26Merge branch 'maint'Junio C Hamano1-2/+2
2010-10-25Fix copy-pasted comments related to tree diff handling.Yann Dirson1-2/+2
2010-10-21diff: don't presume empty file when corresponding object is missingNicolas Pitre1-2/+6
2010-10-21diff: report bogus input to -C/-M/-BJeff King1-3/+3
2010-10-16diff --check: correct line numbers of new blank lines at EOFChristoph Mallon1-1/+1
2010-09-29Merge branch 'jc/pickaxe-grep'Junio C Hamano1-3/+8
2010-09-29diff: trivial fix for --output file error messageMatthieu Moy1-1/+1
2010-09-29diff: add synonyms for -M, -C, -BKevin Ballard1-3/+22
2010-09-29merge-recursive: option to specify rename thresholdKevin Ballard1-3/+3
2010-09-23do not search functions for patch IDClemens Buchacher1-1/+1
2010-09-23diff: don't use pathname-based diff drivers for symlinksJeff King1-3/+8
2010-09-09Merge branch 'maint'Junio C Hamano1-1/+4
2010-09-09diff.c: call regfree to free memory allocated by regcomp when necessaryBrandon Casey1-1/+4
2010-08-31Merge branch 'cb/binary-patch-id'Junio C Hamano1-0/+7
2010-08-31git log/diff: add -G<regexp> that greps in the patch textJunio C Hamano1-2/+7
2010-08-31diff: pass the entire diff-options to diffcore_pickaxe()Junio C Hamano1-1/+1
2010-08-21Merge branch 'mm/shortopt-detached'Junio C Hamano1-43/+124
2010-08-18Merge branch 'jc/maint-follow-rename-fix'Junio C Hamano1-14/+13
2010-08-18Merge branch 'jl/submodule-ignore-diff'Junio C Hamano1-7/+34
2010-08-16hash binary sha1 into patch idClemens Buchacher1-0/+7
2010-08-13diff --follow: do call diffcore_std() as necessaryJunio C Hamano1-14/+13
2010-08-11diff: strip extra "/" when stripping prefixJakub Narebski1-2/+8
2010-08-09Add the 'diff.ignoreSubmodules' config settingJohannes Schindelin1-1/+5
2010-08-09Submodules: Add the new "ignore" config option for diff and statusJens Lehmann1-6/+29
2010-08-06diff: parse separate options --stat-width n, --stat-name-width nMatthieu Moy1-5/+23
2010-08-06diff: split off a function for --stat-* option parsingJonathan Nieder1-27/+35
2010-08-06diff: parse separate options like -S fooMatthieu Moy1-16/+71
2010-08-03Merge branch 'sv/maint-diff-q-clear-fix' into maintJunio C Hamano1-1/+0
2010-08-02Fix DIFF_QUEUE_CLEAR refactoringJunio C Hamano1-1/+0
2010-07-08diff.c: fix a graph output bugBo Yang1-2/+1
2010-06-30Merge branch 'jl/status-ignore-submodules'Junio C Hamano1-11/+4
2010-06-30Merge branch 'jl/maint-diff-ignore-submodules'Junio C Hamano1-1/+10
2010-06-27Merge branch 'ab/blame-textconv'Junio C Hamano1-8/+4
2010-06-25Add the option "--ignore-submodules" to "git status"Jens Lehmann1-11/+4
2010-06-22Merge branch 'maint'Junio C Hamano1-1/+0
2010-06-22Merge branch 'cc/maint-diff-CC-binary' into maintJunio C Hamano1-5/+16
2010-06-21Merge branch 'bw/diff-metainfo-color' into maintJunio C Hamano1-26/+35
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano1-5/+5
2010-06-18Merge branch 'cc/maint-diff-CC-binary'Junio C Hamano1-5/+16
2010-06-18Merge branch 'by/diff-graph'Junio C Hamano1-97/+312
2010-06-18Merge branch 'jh/diff-index-line-abbrev'Junio C Hamano1-3/+3
2010-06-18Merge branch 'ec/diff-noprefix-config'Junio C Hamano1-1/+8
2010-06-13Merge branch 'bw/diff-metainfo-color'Junio C Hamano1-26/+35
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano1-5/+5
2010-06-11Add optional parameters to the diff option "--ignore-submodules"Jens Lehmann1-1/+10
2010-06-11textconv: make the API publicAxel Bonnet1-8/+4
2010-06-06diff: fix "git show -C -C" output when renaming a binary fileChristian Couder1-6/+17
2010-05-31Make --color-words work well with --graphBo Yang1-17/+104
2010-05-31Emit a whole line in one goBo Yang1-5/+27
2010-05-31diff.c: Output the text graph padding before each diff lineBo Yang1-53/+147
2010-05-31Add a prefix output callback to diff outputBo Yang1-27/+35
2010-05-31diff.c: Ensure "index $from..$to" line contains unambiguous SHA1sJohan Herland1-3/+3
2010-05-21Merge branch 'by/log-follow'Junio C Hamano1-8/+13
2010-05-21Merge branch 'tr/word-diff'Junio C Hamano1-19/+120
2010-05-19diff: fix coloring of extended diff headersBert Wesarg1-26/+35
2010-05-18diff-options: make --patch a synonym for -pWill Palmer1-1/+1
2010-05-18diff: add configuration option for disabling diff prefixes.Eli Collins1-1/+8
2010-05-08Merge branch 'jk/cached-textconv'Junio C Hamano1-46/+73
2010-05-07Make diffcore_std only can run once before a diff_flushBo Yang1-0/+8
2010-05-07Add a macro DIFF_QUEUE_CLEAR.Bo Yang1-8/+5
2010-05-04Merge branch 'maint-1.7.0' into maintJunio C Hamano1-10/+5
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe1-10/+5
2010-05-02git diff too slow for a fileRené Scharfe1-5/+5
2010-04-22Merge branch 'jk/maint-diffstat-overflow' into maintJunio C Hamano1-9/+12
2010-04-18Merge branch 'jk/maint-diffstat-overflow'Junio C Hamano1-9/+12
2010-04-17diff: use large integers for diffstat calculationsJeff King1-9/+12
2010-04-14diff: add --word-diff option that generalizes --color-wordsThomas Rast1-19/+120
2010-04-09Merge branch 'jc/conflict-marker-size' into maintJunio C Hamano1-13/+11
2010-04-08Merge early parts of jk/cached-textconvJunio C Hamano1-0/+4
2010-04-08diff.c: work around pointer constness warningsJunio C Hamano1-2/+2
2010-04-06Merge branch 'jc/conflict-marker-size'Junio C Hamano1-13/+11
2010-04-02diff: avoid useless filespec populationJeff King1-5/+4
2010-04-02diff: cache textconv outputJeff King1-9/+43
2010-04-02textconv: refactor calls to run_textconvJeff King1-36/+30
2010-04-01fix textconv leak in emit_rewrite_diffJeff King1-0/+4
2010-03-31Sync with 1.7.0.4Junio C Hamano1-6/+11
2010-03-30diff: fix textconv error zombiesJohannes Sixt1-6/+11
2010-03-24diff --check: honor conflict-marker-size attributeJunio C Hamano1-13/+11
2010-03-24Merge branch 'jl/submodule-diff-dirtiness'Junio C Hamano1-2/+11
2010-03-12git status: Fix false positive "new commits" output for dirty submodulesJens Lehmann1-2/+5
2010-03-12Refactor dirty submodule detection in diff-lib.cJens Lehmann1-0/+6
2010-03-04Merge branch 'ld/maint-diff-quiet-w' into maintJunio C Hamano1-0/+23
2010-03-02Merge branch 'ld/maint-diff-quiet-w'Junio C Hamano1-0/+23
2010-03-02Merge branch 'ml/color-when'Junio C Hamano1-0/+9
2010-02-18Add an optional argument for --color optionsMark Lodato1-0/+9
2010-02-17Merge branch 'jc/typo' into maintJunio C Hamano1-1/+1
2010-02-16Merge branch 'jc/typo'Junio C Hamano1-1/+1
2010-02-16Merge branch 'maint-1.6.6' into maintJunio C Hamano1-0/+2
2010-02-16Merge branch 'maint-1.6.5' into maint-1.6.6Junio C Hamano1-0/+2
2010-02-15git diff --quiet -w: check and report the statusLarry D'Anna1-0/+23
2010-02-15diff: make sure --output=/bad/path is caughtLarry D'Anna1-0/+2
2010-02-03Typofixes outside documentation areaJunio C Hamano1-1/+1
2010-01-26Merge branch 'jl/diff-submodule-ignore'Junio C Hamano1-1/+1
2010-01-24Teach diff --submodule that modified submodule directory is dirtyJens Lehmann1-1/+1
2010-01-24Merge branch 'jc/fix-tree-walk'Junio C Hamano1-0/+17
2010-01-22Merge branch 'jl/submodule-diff'Junio C Hamano1-5/+17
2010-01-18Merge branch 'maint-1.6.4' into maint-1.6.5Junio C Hamano1-0/+2
2010-01-18Merge branch 'maint-1.6.3' into maint-1.6.4Junio C Hamano1-0/+2
2010-01-18Merge branch 'maint-1.6.2' into maint-1.6.3Junio C Hamano1-0/+2
2010-01-18Performance optimization for detection of modified submodulesJens Lehmann1-4/+11
2010-01-17Merge branch 'jk/run-command-use-shell'Junio C Hamano1-1/+2
2010-01-16Teach diff that modified submodule directory is dirtyJunio C Hamano1-2/+7
2010-01-13Merge branch 'nd/sparse'Junio C Hamano1-1/+1
2010-01-10Merge branch 'maint-1.6.1' into maint-1.6.2Junio C Hamano1-0/+2
2010-01-07unpack-trees.c: look ahead in the indexJunio C Hamano1-0/+17
2010-01-05diff: run external diff helper with shellJeff King1-1/+1
2010-01-05textconv: use shell to run helperJeff King1-0/+1
2009-12-30Merge branch 'maint'Junio C Hamano1-0/+2
2009-12-30Merge branch 'maint-1.6.1' into maintJunio C Hamano1-0/+2
2009-12-30textconv: stop leaking file descriptorsJeff King1-0/+2
2009-12-26Merge branch 'gb/1.7.0-diff-whitespace-only-output'Junio C Hamano1-8/+27
2009-12-26Merge branch 'jc/1.7.0-diff-whitespace-only-status'Junio C Hamano1-5/+33
2009-12-16Merge branch 'maint' to sync with 1.6.5.7Junio C Hamano1-1/+3
2009-12-16ignore unknown color configurationJeff King1-1/+3
2009-11-28Give the hunk comment its own colorBert Wesarg1-3/+40
2009-11-27emit_line(): don't emit an empty <SET><RESET> followed by a newlineJunio C Hamano1-6/+7
2009-11-20No diff -b/-w output for all-whitespace changesGreg Bacon1-8/+27
2009-11-16Merge branch 'js/maint-diff-color-words' into maintJunio C Hamano1-8/+12
2009-11-15Merge branch 'jc/maint-blank-at-eof' into maintJunio C Hamano1-145/+262
2009-11-15Merge branch 'js/maint-diff-color-words'Junio C Hamano1-8/+12
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-07 14:55:05 +0000