aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
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
2009-10-31diff --color-words: bit of clean-upJunio C Hamano1-14/+12
2009-10-30Merge branch 'js/diff-verbose-submodule'Junio C Hamano1-0/+18
2009-10-30diff --color-words -U0: fix the location of hunk headersJohannes Schindelin1-0/+6
2009-10-19Add the --submodule option to the diff option familyJohannes Schindelin1-0/+18
2009-10-17Merge branch 'jc/maint-blank-at-eof'Junio C Hamano1-145/+262
2009-10-11diff.c: stylefixFelipe Contreras1-1/+1
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' into jc/maint-blank-at-eofJunio C Hamano1-22/+47
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano1-14/+35
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano1-148/+148
2009-09-15Merge branch 'jc/maint-1.6.0-blank-at-eof' (early part) into jc/maint-blank-a...Junio C Hamano1-42/+113
2009-09-15diff -B: colour whitespace errorsJunio C Hamano1-26/+49
2009-09-15diff.c: emit_add_line() takes only the rest of the lineJunio C Hamano1-7/+9
2009-09-15diff.c: split emit_line() from the first char and the rest of the lineJunio C Hamano1-7/+26
2009-09-14diff.c: shuffling code aroundJunio C Hamano1-125/+125
2009-09-14diff --whitespace: fix blank lines at endJunio C Hamano1-21/+53
2009-09-04diff --color: color blank-at-eofJunio C Hamano1-10/+27
2009-09-04diff --whitespace=warn/error: fix blank-at-eof checkJunio C Hamano1-16/+48
2009-09-04diff --whitespace=warn/error: obey blank-at-eofJunio C Hamano1-3/+7
2009-09-04diff.c: the builtin_diff() deals with only two-file comparisonJunio C Hamano1-23/+9
2009-08-31Style fixes, add a space after if/for/while.Brian Gianforcaro1-1/+1
2009-08-30diff.c: fix typoes in commentsJim Meyering1-2/+2
2009-08-23Teach Git to respect skip-worktree bit (reading part)Nguyễn Thái Ngọc Duy1-1/+1
2009-07-29diff: Rename QUIET internal option to QUICKJunio C Hamano1-2/+2
2009-07-29diff: change semantics of "ignore whitespace" optionsJunio C Hamano1-3/+31
2009-07-09Merge branch 'rs/grep-p'Junio C Hamano1-0/+1
2009-07-06Merge branch 'tr/die_errno'Junio C Hamano1-5/+5
2009-07-01userdiff: add xdiff_clear_find_func()René Scharfe1-0/+1
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast1-3/+3
2009-06-27Convert existing die(..., strerror(errno)) to die_errno()Thomas Rast1-2/+2
2009-06-09Merge branch 'maint'Junio C Hamano1-0/+1
2009-06-08diff.c: plug a memory leak in an error pathJohannes Sixt1-0/+1
2009-05-31diff: generate pretty filenames in prep_temp_blob()David Aguilar1-1/+11
2009-05-25Merge branch 'ar/unlink-err' into maintJunio C Hamano1-1/+1
2009-05-25convert bare readlink to strbuf_readlinkJeff King1-7/+4
2009-05-18Merge branch 'ar/unlink-err'Junio C Hamano1-1/+1
2009-05-18Merge branch 'mh/diff-stat-color'Junio C Hamano1-8/+7
2009-05-03Merge branch 'jc/maint-1.6.0-keep-pack' into maint-1.6.1Junio C Hamano1-1/+1
2009-05-03Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Junio C Hamano1-1/+9
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras1-2/+2
2009-04-29replace direct calls to unlink(2) with unlink_or_warnAlex Riesen1-1/+1
2009-04-26diff: do not color --stat output like patch contextMarkus Heidelberg1-8/+7
2009-04-11Allow users to un-configure rename detectionLinus Torvalds1-7/+10
2009-04-08Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano1-1/+9
2009-04-08Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano1-1/+1
2009-03-28Merge branch 'jc/maint-1.6.0-diff-borrow-carefully'Junio C Hamano1-1/+9
2009-03-26Merge branch 'js/maint-diff-temp-smudge'Junio C Hamano1-3/+10
2009-03-22diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano1-1/+9
2009-03-22Smudge the files fed to external diff and textconvJohannes Schindelin1-3/+10
2009-03-11Merge branch 'jc/maint-1.6.0-keep-pack'Junio C Hamano1-1/+1
2009-03-07Remove unused function scope local variablesBenjamin Kramer1-3/+1
2009-03-05Merge branch 'al/ansi-color'Junio C Hamano1-8/+8
2009-03-04Use DIFF_XDL_SET/DIFF_OPT_SET instead of raw bit-maskingKeith Cascio1-7/+10
2009-02-28has_sha1_pack(): refactor "pretend these packs do not exist" interfaceJunio C Hamano1-1/+1
2009-02-13Remove redundant bit clears from diff_setup()Keith Cascio1-3/+0
2009-02-13Clean up use of ANSI color sequencesArjen Laarhoven1-8/+8
2009-02-12Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy1-4/+4
2009-01-31Merge branch 'jc/maint-split-diff-metainfo'Junio C Hamano1-66/+80
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-05 20:13:48 +0000