aboutsummaryrefslogtreecommitdiffstats
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2007-05-26Merge branch 'maint'Junio C Hamano1-1/+1
2007-05-26Merge branch 'maint-1.5.1' into maintJunio C Hamano1-1/+1
2007-05-25Replace the last 'dircache's by 'index'Jakub Narebski1-1/+1
2007-05-21rename dirlink to gitlink.Martin Waitz1-1/+1
2007-05-20Merge branch 'maint-1.5.1' into maintJunio C Hamano1-4/+2
2007-05-20Use PATH_MAX instead of TEMPFILE_PATH_LENFernando J. Pereda1-4/+2
2007-05-15Ensure return value from xread() is always stored into an ssize_tJohan Herland1-1/+1
2007-05-07diff.c: do not use a separate "size cache".Junio C Hamano1-68/+4
2007-05-07diff: release blobs after generating textual diff.Junio C Hamano1-5/+17
2007-05-03Merge branch 'maint'Junio C Hamano1-6/+7
2007-05-03diff.c: fix "size cache" handling.Junio C Hamano1-6/+7
2007-04-22Support 'diff=pgm' attributeJunio C Hamano1-5/+82
2007-04-21Merge branch 'jc/attr'Junio C Hamano1-11/+43
2007-04-20Simplify calling of CR/LF conversion routinesAlex Riesen1-2/+2
2007-04-18Fix funny types used in attribute value representationJunio C Hamano1-2/+2
2007-04-17Allow more than true/false to attributes.Junio C Hamano1-3/+12
2007-04-15Fix 'diff' attribute semantics.Junio C Hamano1-2/+3
2007-04-15Expose subprojects as special files to "git diff" machineryLinus Torvalds1-0/+20
2007-04-14Teach 'diff' about 'diff' attribute.Junio C Hamano1-9/+31
2007-04-05Show binary file size change in diff --statAndy Parkins1-3/+10
2007-03-14diff --quietJunio C Hamano1-2/+25
2007-03-14Remove unused diffcore_std_no_resolveJunio C Hamano1-11/+0
2007-03-14Allow git-diff exit with codes similar to diff(1)Alex Riesen1-0/+6
2007-03-10Merge branch 'js/diff-ni'Junio C Hamano1-0/+33
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce1-4/+5
2007-03-04diff-ni: fix the diff with standard inputJunio C Hamano1-16/+29
2007-03-03diff: support reading a file from stdin via "-"Johannes Schindelin1-0/+20
2007-02-28Merge branch 'np/types'Junio C Hamano1-3/+4
2007-02-27convert object type handling from a string to a numberNicolas Pitre1-3/+4
2007-02-26diff --no-index: also imitate the exit status of diff(1)Johannes Schindelin1-0/+6
2007-02-26Merge branch 'master' into js/diff-niJunio C Hamano1-51/+100
2007-02-24Merge branch 'maint'Junio C Hamano1-2/+4
2007-02-24diff-patch: Avoid emitting double-slashes in textual patch.Junio C Hamano1-2/+4
2007-02-22Merge branches 'lt/crlf' and 'jc/apply-config'Junio C Hamano1-1/+16
2007-02-22Teach git-diff-files the new option `--no-index`Johannes Schindelin1-1/+2
2007-02-21Teach diff -B about coloursJohannes Schindelin1-14/+25
2007-02-20prefixcmp(): fix-up leftover strncmp().Junio C Hamano1-1/+1
2007-02-20Mechanical conversion to use prefixcmp()Junio C Hamano1-15/+15
2007-02-19Merge branch 'js/diff-color-check'Junio C Hamano1-18/+39
2007-02-18diff --check: use colourJohannes Schindelin1-18/+39
2007-02-14Lazy man's auto-CRLFLinus Torvalds1-1/+16
2007-02-13teach diff machinery about --ignore-space-at-eolJohannes Schindelin1-0/+2
2007-02-13Merge branch 'jc/diff-apply-patch'Junio C Hamano1-3/+17
2007-02-13Mark places that need blob munging later for CRLF conversion.Linus Torvalds1-0/+1
2007-02-11diff.c: More logical file name quoting for renames in diffstat.Alexandre Julliard1-7/+27
2007-02-11diff.c: Properly quote file names in diff --summary output.Alexandre Julliard1-5/+12
2007-02-11diff.c: Reuse the pprint_rename function for diff --summary output.Alexandre Julliard1-27/+4
2007-02-09diff_flush_name(): take struct diff_options parameter.Junio C Hamano1-4/+4
2007-01-08short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft1-1/+1
2007-01-07Merge branch 'sp/mmap'Junio C Hamano1-3/+1
2007-01-06diff-index --cached --raw: show tree entry on the LHS for unmerged entries.Junio C Hamano1-2/+4
2006-12-29Replace mmap with xmmap, better handling MAP_FAILED.Shawn O. Pearce1-3/+1
2006-12-21Merge branch 'maint'Junio C Hamano1-2/+2
2006-12-21diff --check: fix off by one errorJohannes Schindelin1-2/+2
2006-12-20simplify inclusion of system header files.Junio C Hamano1-3/+0
2006-12-19fix populate-filespecJunio C Hamano1-1/+1
2006-12-15make commit message a little more consistent and confortingNicolas Pitre1-1/+37
2006-12-15Avoid accessing a slow working copy during diffcore operations.Shawn O. Pearce1-3/+21
2006-12-13Merge branch 'jc/numstat'Junio C Hamano1-1/+4
2006-12-13Allow subcommand.color and color.subcommand color configurationAndy Parkins1-2/+2
2006-12-11diff --numstat: show binary with '-' to match "apply --numstat"Junio C Hamano1-1/+4
2006-11-21git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 2)Junio C Hamano1-3/+17
2006-10-18Merge branch 'js/diff'Junio C Hamano1-0/+1
2006-10-13diff --numstatJunio C Hamano1-2/+27
2006-10-05Turn on recursive with --summaryJohannes Schindelin1-0/+1
2006-09-30Merge branch 'jc/diff-stat'Junio C Hamano1-41/+125
2006-09-29git-diff -B output fix.Junio C Hamano1-1/+1
2006-09-28diff --stat: ensure at least one '-' for deletions, and one '+' for additionsJohannes Schindelin1-4/+7
2006-09-28diff --stat=width[,name-width]: allow custom diffstat output width.Linus Torvalds1-8/+25
2006-09-27diff --stat: color output.Junio C Hamano1-10/+19
2006-09-27diff --stat: allow custom diffstat output width.Junio C Hamano1-38/+93
2006-09-24diff.c: second war on whitespace.Junio C Hamano1-41/+131
2006-09-17Merge branch 'jk/diff'Junio C Hamano1-132/+7
2006-09-08Move color option parsing out of diff.c and into color.[ch]Jeff King1-132/+4
2006-09-07diff: support custom callbacks for outputJeff King1-0/+3
2006-09-07diff --binary generates full index on binary files.Junio C Hamano1-1/+7
2006-09-02Replace uses of strdup with xstrdup.Shawn Pearce1-2/+2
2006-08-27Merge branch 'jc/apply'Junio C Hamano1-2/+8
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce1-3/+3
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes1-5/+5
2006-08-16diff.c: make binary patch reversible.Junio C Hamano1-2/+8
2006-08-15remove unnecessary initializationsDavid Rientjes1-2/+2
2006-08-15make inline is_null_sha1 globalDavid Rientjes1-1/+1
2006-08-14diff.c cleanupDavid Rientjes1-3/+1
2006-08-12Merge branch 'th/diff-extra'Junio C Hamano1-0/+13
2006-08-10Add the --color-words option to the diff options familyJohannes Schindelin1-6/+172
2006-08-09allow diff.renamelimit to be set regardless of -M/-Cv1.4.2-rc4Junio C Hamano1-3/+0
2006-08-09make --find-copies-harder imply -CJunio C Hamano1-3/+4
2006-08-03diff.c: do not use pathname comparison to tell renamesJunio C Hamano1-5/+1
2006-07-31pager: config variable pager.colorMatthias Lederhofer1-1/+1
2006-07-24Colorize 'commit' lines in log uiJeff King1-17/+11
2006-07-13diff: Support 256 colorsTimo Hirvonen1-6/+18
2006-07-13diff: Support both attributes and colorsTimo Hirvonen1-57/+107
2006-07-10Avoid C99 initializersShawn Pearce1-6/+6
2006-07-09Merge branch 'ew/diff'Junio C Hamano1-1/+23
2006-07-09"git -p cmd" to page anywhereJunio C Hamano1-1/+1
2006-07-09Merge branch 'sf/diff'Junio C Hamano1-1/+4
2006-07-08diff: do not use configuration magic at the core-levelJunio C Hamano1-1/+7
2006-07-07colored diff: diff.color = auto fixJunio C Hamano1-2/+8
2006-07-07diff.c: --no-color to defeat diff.color configuration.Junio C Hamano1-0/+2
2006-07-07diff.c: respect diff.renames config optionEric Wong1-0/+14
2006-07-07Teach diff -a as shorthand for --textStephan Feder1-1/+1
2006-07-07Teach --text option to diffStephan Feder1-1/+4
2006-07-07Do not drop data from '\0' until eol in patch outputStephan Feder1-1/+3
2006-07-05Merge branch 'th/diff'Junio C Hamano1-96/+125
2006-07-03Make zlib compression level configurable, and change default.Joachim B Haga1-1/+1
2006-07-01--name-only, --name-status, --check and -s are mutually exclusiveTimo Hirvonen1-0/+13
2006-06-28diff.c: fix get_patch_id()Junio C Hamano1-1/+1
2006-06-27Fix some more diff options changes.Junio C Hamano1-7/+8
2006-06-27Fix diff-tree -sTimo Hirvonen1-3/+0
2006-06-27Print empty line between raw, stat, summary and patchTimo Hirvonen1-5/+42
2006-06-26Don't xcalloc() struct diffstat_tTimo Hirvonen1-6/+5
2006-06-26Add msg_sep to diff_optionsTimo Hirvonen1-0/+1
2006-06-26Set default diff output format after parsing command lineTimo Hirvonen1-1/+0
2006-06-26Make --raw option available for all diff commandsTimo Hirvonen1-0/+2
2006-06-26Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen1-95/+88
2006-06-26add diff_flush_patch_id() to calculate the patch idJohannes Schindelin1-0/+139
2006-06-26Merge branch 'jc/diff'Junio C Hamano1-14/+80
2006-06-26Merge branch 'js/diff'Junio C Hamano1-4/+9
2006-06-25diff --color: use $GIT_DIR/configJunio C Hamano1-14/+80
2006-06-24Clean up diff.cTimo Hirvonen1-12/+6
2006-06-24diff --color: use reset sequence when we mean reset.Junio C Hamano1-1/+1
2006-06-23Teach diff about -b and -w flagsJohannes Schindelin1-4/+9
2006-06-22Tweak diff colorsLinus Torvalds1-41/+58
2006-06-21Merge branch 'ff/c99' into nextJunio C Hamano1-1/+1
2006-06-20Remove all void-pointer arithmetic.Florian Forster1-1/+1
2006-06-17diff options: add --colorJohannes Schindelin1-9/+70
2006-05-24Merge branch 'js/fmt-patch'Junio C Hamano1-1/+5
2006-05-23--summary output should print immediately after stats.Sean1-1/+4
2006-05-22Avoid segfault in diff --stat rename output.Sean1-1/+1
2006-05-22diff: minor option combination fix.Junio C Hamano1-0/+8
2006-05-21checkdiff_consume: strtol parameter fix.Junio C Hamano1-1/+1
2006-05-21fmt-patch: Support --attachJohannes Schindelin1-1/+5
2006-05-21diff family: add --check optionJohannes Schindelin1-1/+114
2006-05-15Merge branch 'se/diff'Junio C Hamano1-1/+87
2006-05-15Merge branch 'lt/diff'Junio C Hamano1-1/+51
2006-05-14diffstat rename squashing fix.Junio C Hamano1-2/+7
2006-05-14Add "--summary" option to git diff.Sean1-1/+87
2006-05-14git diff: support "-U" and "--unified" options properlyLinus Torvalds1-1/+51
2006-05-09Merge branch 'jc/bindiff'Junio C Hamano1-7/+107
2006-05-08Merge branch 'fix'Junio C Hamano1-1/+1
2006-05-08Fix "git diff --stat" with long filenamesLinus Torvalds1-1/+1
2006-05-05binary diff: further updates.Junio C Hamano1-63/+71
2006-05-05binary patch.Junio C Hamano1-7/+99
2006-05-03sha1_to_hex() usage cleanupLinus Torvalds1-4/+2
2006-04-25diff --stat: show complete rewrites consistently.Junio C Hamano1-4/+14
2006-04-22Libify diff-files.Junio C Hamano1-0/+1795
2006-04-19diff: move diff.c to diff-lib.c to make room.Junio C Hamano1-1736/+0
2006-04-19Merge branch 'fix'Junio C Hamano1-3/+4
2006-04-18Fix filename scaling for binary filesJonas Fonseca1-3/+4
2006-04-18Fix "git log --stat": make sure to set recursive with --stat.Junio C Hamano1-0/+9
2006-04-18diff --stat: make sure to set recursive.Junio C Hamano1-0/+10
2006-04-15diff-options: add --patch-with-statJohannes Schindelin1-1/+16
2006-04-15diff-files --stat: do not dump core with unmerged index.Junio C Hamano1-4/+17
2006-04-15diff --stat: do not do its own three-dashes.Junio C Hamano1-2/+0
2006-04-13diff --stat: no need to ask funcnames nor context.Junio C Hamano1-2/+2
2006-04-13diff-options: add --stat (take 2)Johannes Schindelin1-5/+5
2006-04-13diff-options: add --stat (take 2)Johannes Schindelin1-5/+217
2006-04-11Separate the raw diff and patch with a newlinePetr Baudis1-0/+1
2006-04-10diff-* --patch-with-rawJunio C Hamano1-33/+49
2006-04-10Retire diffcore-pathspec.Junio C Hamano1-2/+0
2006-04-08diff: fix output of total-rewrite diff.Junio C Hamano1-2/+3
2006-04-05Merge branches 'master' and 'jc/combine' into nextJunio C Hamano1-19/+25
2006-04-05Merge branch 'fix'Junio C Hamano1-19/+25
2006-04-05diff_flush(): leakfix.Junio C Hamano1-19/+25
2006-04-04Support for pickaxe matching regular expressionsPetr Baudis1-0/+2
2006-03-29tree/diff header cleanup.Junio C Hamano1-1/+1
2006-03-27xdiff: Show function names in hunk headers.Mark Wooding1-0/+1
2006-03-26Merge branch 'lt/diffgen' into nextJunio C Hamano1-162/+94
2006-03-25true built-in diff: run everything in-core.Junio C Hamano1-162/+94
2006-03-25Merge branch 'lt/diffgen' into nextJunio C Hamano1-6/+104
2006-03-25built-in diff: minimum tweaksJunio C Hamano1-5/+36
2006-03-25Use a *real* built-in diff generatorLinus Torvalds1-6/+73
2006-03-12diffcore-rename: somewhat optimized.Junio C Hamano1-0/+2
2006-02-26Make git diff-generation use a simpler spawn-like interfaceLinus Torvalds1-58/+80
2006-02-21Merge branch 'jc/nostat'Junio C Hamano1-1/+1
2006-02-10find_unique_abbrev() simplification.Junio C Hamano1-11/+3
2006-02-08"Assume unchanged" gitJunio C Hamano1-1/+1
2006-02-01Allow diff and index commands to be interruptedPetr Baudis1-0/+2
2006-01-28diff --abbrev=<n> option fix.Junio C Hamano1-1/+6
2006-01-28abbrev cleanup: use symbolic constantsJunio C Hamano1-2/+2
2005-12-29code comments: spellJunio C Hamano1-1/+1
2005-12-26Handle symlinks graciouslyJohannes Schindelin1-1/+1
2005-12-26avoid asking ?alloc() for zero bytes.Junio C Hamano1-3/+3
2005-12-19diff: --abbrev optionJunio C Hamano1-6/+51
2005-11-21Move diff.renamelimit out of default configuration.Junio C Hamano1-0/+10
2005-11-21rename/copy score parsing updates.H. Peter Anvin1-12/+21
2005-11-21rename detection with -M100 means "exact renames only".Junio C Hamano1-0/+4
2005-11-16diff: --full-indexJunio C Hamano1-6/+8
2005-11-15diff: make default rename detection limit configurable.Junio C Hamano1-2/+7
2005-10-22Split up tree diff functions into tree-diff.c libraryLinus Torvalds1-0/+3
2005-10-18Handle "-" at beginning of filenames, part 3Linus Torvalds1-1/+1
2005-10-17Update git-diff-* to use C-style quoting for funny pathnames.Junio C Hamano1-40/+95
2005-10-07Show original and resulting blob object info in diff output.Junio C Hamano1-20/+57
2005-09-30Consolidate null_sha1[].Junio C Hamano1-2/+1
2005-09-24Diff: --name-status output format.Junio C Hamano1-9/+13
2005-09-24Diff: -l<num> to limit rename/copy detection.Junio C Hamano1-2/+5
2005-09-24Diff clean-up.Junio C Hamano1-44/+93
2005-09-22Retire diff-helper.Junio C Hamano1-23/+0
2005-09-15Plug diff leaks.Junio C Hamano1-1/+4