aboutsummaryrefslogtreecommitdiffstats
path: root/combine-diff.c
AgeCommit message (Expand)AuthorFilesLines
2012-09-10Merge branch 'jk/maint-null-in-trees' into maint-1.7.11Junio C Hamano1-2/+2
2012-07-29diff: do not use null sha1 as a sentinel valueJeff King1-2/+2
2012-04-16Merge branch 'rs/combine-diff-zero-context-at-the-beginning'Junio C Hamano1-1/+1
2012-03-25combine-diff: fix loop index underflowRené Scharfe1-1/+1
2011-12-17pass struct commit to diff_tree_combined_merge()René Scharfe1-4/+3
2011-12-17use struct sha1_array in diff_tree_combined()René Scharfe1-21/+13
2011-08-28Merge branch 'jk/color-and-pager'Junio C Hamano1-4/+3
2011-08-28Merge branch 'jc/combine-diff-callback'Junio C Hamano1-0/+69
2011-08-20combine-diff: support format_callbackJunio C Hamano1-0/+69
2011-08-18diff: refactor COLOR_DIFF from a flag into an intJeff King1-4/+3
2011-08-17Merge branch 'jc/maint-combined-diff-work-tree'Junio C Hamano1-4/+10
2011-08-04diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Junio C Hamano1-4/+10
2011-05-24combine-diff: respect textconv attributesJeff King1-9/+32
2011-05-23combine-diff: handle binary files as binaryJeff King1-2/+35
2011-05-23combine-diff: calculate mode_differs earlierJeff King1-2/+7
2011-05-23combine-diff: split header printing into its own functionJeff King1-61/+74
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano1-1/+1
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano1-1/+1
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe1-2/+1
2010-05-02git diff too slow for a fileRené Scharfe1-1/+1
2010-04-17combined diff: correctly handle truncated fileThomas Rast1-6/+8
2009-11-28Give the hunk comment its own colorBert Wesarg1-1/+4
2009-07-22Merge branch 'maint'Junio C Hamano1-15/+14
2009-07-22diff --cc: a lost line at the beginning of the file is shown incorrectlyJunio C Hamano1-7/+9
2009-07-22combine-diff.c: fix performance problem when folding common deleted linesJunio C Hamano1-8/+5
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast1-1/+1
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras1-2/+2
2009-04-29Merge branch 'maint'Junio C Hamano1-9/+25
2009-04-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano1-12/+26
2009-04-29diff -c -p: do not die on submodulesJunio C Hamano1-12/+26
2009-03-17Merge branch 'kb/checkout-optim'Junio C Hamano1-3/+1
2009-03-07Move local variables to narrower scopesBenjamin Kramer1-2/+1
2009-02-09show_patch_diff(): remove a call to fstat()Kjetil Barvik1-3/+1
2008-12-17combine-diff.c: use strbuf_readlink()Junio C Hamano1-5/+5
2008-10-25Always initialize xpparam_t to 0Brian Downing1-0/+1
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey1-2/+1
2008-09-18Merge branch 'jc/diff-prefix'Junio C Hamano1-2/+6
2008-09-07Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano1-2/+14
2008-08-30diff: vary default prefix depending on what are comparedJunio C Hamano1-2/+6
2008-08-30diff: Help "less" hide ^M from the outputJunio C Hamano1-2/+14
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano1-0/+12
2008-08-23Respect core.autocrlf in combined diffAlexander Gavrilov1-0/+12
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano1-5/+2
2008-08-13Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing1-3/+2
2008-06-22Merge branch 'jc/maint-combine-diff-pre-context'Junio C Hamano1-2/+5
2008-06-18diff -c/--cc: do not include uninteresting deletion before leading contextJunio C Hamano1-2/+5
2008-05-03Cleanup xread() loops to use read_in_full()Heikki Orsila1-9/+8
2008-05-03Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins1-3/+3
2008-04-27Die for an early EOF in a file reading loopHeikki Orsila1-3/+3
2007-12-26Fix rewrite_diff() name quoting.Junio C Hamano1-10/+1
2007-12-26combine-diff: Fix path quotingJunio C Hamano1-10/+31
2007-12-13xdl_diff: identify call sites.Junio C Hamano1-1/+1
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit1-5/+5
2007-09-20Full rework of quote_c_style and write_name_quoted.Pierre Habouzit1-14/+2
2007-07-06Future-proof source for changes in xdemitconf_tJohannes Schindelin1-2/+1
2007-05-15Ensure return value from xread() is always stored into an ssize_tJohan Herland1-1/+1
2007-04-22Support 'diff=pgm' attributeJunio C Hamano1-0/+1
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce1-2/+2
2007-03-03Tell multi-parent diff about core.symlinks.Johannes Sixt1-0/+10
2007-02-27convert object type handling from a string to a numberNicolas Pitre1-3/+3
2007-02-27diff --cc: integer overflow given a 2GB-or-larger fileJim Meyering1-3/+3
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano1-4/+21
2007-02-03combine-diff: special case --unified=0Junio C Hamano1-4/+30
2006-10-26Merge branch 'jc/combined'Junio C Hamano1-4/+8
2006-10-26combine-diff: honour --no-commit-idJunio C Hamano1-3/+3
2006-10-26combine-diff: fix hunk_comment_line logic.Junio C Hamano1-1/+5
2006-10-26Merge branch 'jc/combined'Junio C Hamano1-5/+43
2006-10-26combine-diff: a few more finishing touches.Junio C Hamano1-5/+43
2006-10-13diff --numstatJunio C Hamano1-3/+6
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce1-5/+5
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes1-2/+2
2006-08-15make inline is_null_sha1 globalDavid Rientjes1-2/+2
2006-08-14Remove combine-diff.c::uninteresting()Junio C Hamano1-9/+2
2006-08-13Fix type of combine-diff.c::show_patch_diff()Junio C Hamano1-7/+5
2006-08-10combine-diff: use colorJunio C Hamano1-16/+34
2006-07-25Substitute xmalloc()+memset(0) with xcalloc().Peter Eriksen1-2/+1
2006-07-10Fix more typos, primarily in the codePavel Roskin1-1/+1
2006-07-05Merge branch 'th/diff'Junio C Hamano1-34/+34
2006-06-28combine-diff.c: type sanity.Junio C Hamano1-1/+1
2006-06-28combine-diff.c: type sanityJunio C Hamano1-14/+15
2006-06-27Fix some more diff options changes.Junio C Hamano1-9/+15
2006-06-26Add msg_sep to diff_optionsTimo Hirvonen1-3/+4
2006-06-26Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen1-31/+24
2006-05-14git diff: support "-U" and "--unified" options properlyLinus Torvalds1-0/+1
2006-04-29built-in diff: assorted updates.Junio C Hamano1-17/+30
2006-04-18Merge branch 'lt/logopt'Junio C Hamano1-35/+54
2006-04-17combine-diff: show diffstat with the first parent.Junio C Hamano1-5/+19
2006-04-17Log message printout cleanups (#2)Linus Torvalds1-6/+16
2006-04-17Log message printout cleanupsLinus Torvalds1-26/+21
2006-04-17cleanups: Remove unused vars from combine-diff.cSerge E. Hallyn1-10/+2
2006-04-12Merge branch 'jc/combine' into nextJunio C Hamano1-2/+2
2006-04-12combine-diff: type fix.Junio C Hamano1-2/+2
2006-04-11Merge branch 'jc/combine' into nextJunio C Hamano1-26/+37
2006-04-11combine-diff: fix hunks at the end (take #2).Junio C Hamano1-28/+21
2006-04-11combine-diff: do not lose hunks with only deletion at end.Junio C Hamano1-11/+29
2006-04-11Separate the raw diff and patch with a newlinePetr Baudis1-0/+1
2006-04-10diff-* --patch-with-rawJunio C Hamano1-0/+11
2006-04-06Match ofs/cnt types in diff interface.Junio C Hamano1-1/+2
2006-04-05combine-diff: move the code to parse hunk-header into common library.Junio C Hamano1-46/+0
2006-04-05combine-diff: refactor built-in xdiff interface.Junio C Hamano1-45/+7
2006-04-04combine-diff: use built-in xdiff.Junio C Hamano1-102/+136
2006-04-04Use blob_, commit_, tag_, and tree_type throughout.Peter Eriksen1-1/+2
2006-03-29tree/diff header cleanup.Junio C Hamano1-1/+1
2006-02-27combine-diff: Honour -z option correctly.Mark Wooding1-2/+2
2006-02-27combine-diff: Honour --full-index.Mark Wooding1-4/+6
2006-02-13combine-diff: diff-files fix.Junio C Hamano1-4/+5
2006-02-10combine-diff: Record diff status a bit more faithfullyJunio C Hamano1-7/+25
2006-02-10find_unique_abbrev() simplification.Junio C Hamano1-12/+3
2006-02-09combine-diff: move formatting logic to show_combined_diff()Junio C Hamano1-27/+58
2006-02-09combined-diff: use diffcore before intersecting paths.Junio C Hamano1-1/+2
2006-02-09diff-tree -c raw outputLinus Torvalds1-3/+52
2006-02-06combine-diff: do not punt on removed or added files.Junio C Hamano1-10/+14
2006-02-06combine-diff: show mode changes as well.Junio C Hamano1-11/+31
2006-02-06combine-diff: do not send NULL to printfJunio C Hamano1-6/+17
2006-02-05combine-diff: remove misguided --show-empty hack.Junio C Hamano1-6/+4
2006-02-02combine-diff: finishing touches to git-diff-tree --ccJunio C Hamano1-4/+4
2006-02-02combine-diff: cleanup.Junio C Hamano1-37/+65
2006-02-02combine-diff: show parent line numbers as well.Junio C Hamano1-11/+59
2006-02-02combine-diff: add a bit more comments.Junio C Hamano1-1/+7
2006-02-02combine-diff: fix placement of deletion.Junio C Hamano1-1/+13
2006-02-02combine-diff: add safety check to --cc.Junio C Hamano1-2/+18
2006-02-02combine-diff: update --cc "uninteresting hunks" logic.Junio C Hamano1-69/+33
2006-02-02combine-diff: reuse diff from the same blob.Junio C Hamano1-2/+37
2006-01-28diff-files: -c and --cc options.Junio C Hamano1-20/+46
2006-01-28combine-diff: better hunk splitting.Junio C Hamano1-27/+116
2006-01-28diff-tree --cc: squelch header generation on empty patch.Junio C Hamano1-16/+30
2006-01-28combine-diff: extend --cc logic to Octopus.Junio C Hamano1-26/+63
2006-01-28combine-diff: minor output changes.Junio C Hamano1-3/+2
2006-01-28combine-diff: fix appending at the tail of a list.Junio C Hamano1-11/+6
2006-01-28diff-tree --cc: denser combined diff output for a merge commit.Junio C Hamano1-5/+64
2006-01-28diff-tree -c: show a merge commit a bit more sensibly.Junio C Hamano1-0/+469
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-12-04 04:36:26 +0000