summaryrefslogtreecommitdiffstats
path: root/combine-diff.c
AgeCommit message (Expand)AuthorLines
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey-2/+1
2008-09-18Merge branch 'jc/diff-prefix'Junio C Hamano-2/+6
2008-09-07Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano-2/+14
2008-08-30diff: vary default prefix depending on what are comparedJunio C Hamano-2/+6
2008-08-30diff: Help "less" hide ^M from the outputJunio C Hamano-2/+14
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano-0/+12
2008-08-23Respect core.autocrlf in combined diffAlexander Gavrilov-0/+12
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano-5/+2
2008-08-13Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing-3/+2
2008-06-22Merge branch 'jc/maint-combine-diff-pre-context'Junio C Hamano-2/+5
2008-06-18diff -c/--cc: do not include uninteresting deletion before leading contextJunio C Hamano-2/+5
2008-05-03Cleanup xread() loops to use read_in_full()Heikki Orsila-9/+8
2008-05-03Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins-3/+3
2008-04-27Die for an early EOF in a file reading loopHeikki Orsila-3/+3
2007-12-26Fix rewrite_diff() name quoting.Junio C Hamano-10/+1
2007-12-26combine-diff: Fix path quotingJunio C Hamano-10/+31
2007-12-13xdl_diff: identify call sites.Junio C Hamano-1/+1
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit-5/+5
2007-09-20Full rework of quote_c_style and write_name_quoted.Pierre Habouzit-14/+2
2007-07-06Future-proof source for changes in xdemitconf_tJohannes Schindelin-2/+1
2007-05-15Ensure return value from xread() is always stored into an ssize_tJohan Herland-1/+1
2007-04-22Support 'diff=pgm' attributeJunio C Hamano-0/+1
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce-2/+2
2007-03-03Tell multi-parent diff about core.symlinks.Johannes Sixt-0/+10
2007-02-27convert object type handling from a string to a numberNicolas Pitre-3/+3
2007-02-27diff --cc: integer overflow given a 2GB-or-larger fileJim Meyering-3/+3
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano-4/+21
2007-02-03combine-diff: special case --unified=0Junio C Hamano-4/+30
2006-10-26Merge branch 'jc/combined'Junio C Hamano-4/+8
2006-10-26combine-diff: honour --no-commit-idJunio C Hamano-3/+3
2006-10-26combine-diff: fix hunk_comment_line logic.Junio C Hamano-1/+5
2006-10-26Merge branch 'jc/combined'Junio C Hamano-5/+43
2006-10-26combine-diff: a few more finishing touches.Junio C Hamano-5/+43
2006-10-13diff --numstatJunio C Hamano-3/+6
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce-5/+5
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes-2/+2
2006-08-15make inline is_null_sha1 globalDavid Rientjes-2/+2
2006-08-14Remove combine-diff.c::uninteresting()Junio C Hamano-9/+2
2006-08-13Fix type of combine-diff.c::show_patch_diff()Junio C Hamano-7/+5
2006-08-10combine-diff: use colorJunio C Hamano-16/+34
2006-07-25Substitute xmalloc()+memset(0) with xcalloc().Peter Eriksen-2/+1
2006-07-10Fix more typos, primarily in the codePavel Roskin-1/+1
2006-07-05Merge branch 'th/diff'Junio C Hamano-34/+34
2006-06-28combine-diff.c: type sanity.Junio C Hamano-1/+1
2006-06-28combine-diff.c: type sanityJunio C Hamano-14/+15
2006-06-27Fix some more diff options changes.Junio C Hamano-9/+15
2006-06-26Add msg_sep to diff_optionsTimo Hirvonen-3/+4
2006-06-26Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen-31/+24
2006-05-14git diff: support "-U" and "--unified" options properlyLinus Torvalds-0/+1
2006-04-29built-in diff: assorted updates.Junio C Hamano-17/+30
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-06 11:42:03 +0000