summaryrefslogtreecommitdiff
path: root/combine-diff.c
AgeCommit message (Expand)AuthorFilesLines
2009-11-28Give the hunk comment its own colorLibravatar Bert Wesarg1-1/+4
2009-07-22Merge branch 'maint'Libravatar Junio C Hamano1-15/+14
2009-07-22diff --cc: a lost line at the beginning of the file is shown incorrectlyLibravatar Junio C Hamano1-7/+9
2009-07-22combine-diff.c: fix performance problem when folding common deleted linesLibravatar Junio C Hamano1-8/+5
2009-06-27Use die_errno() instead of die() when checking syscallsLibravatar Thomas Rast1-1/+1
2009-05-01Fix a bunch of pointer declarations (codestyle)Libravatar Felipe Contreras1-2/+2
2009-04-29Merge branch 'maint'Libravatar Junio C Hamano1-9/+25
2009-04-29Merge branch 'maint-1.6.0' into maint-1.6.1Libravatar Junio C Hamano1-12/+26
2009-04-29diff -c -p: do not die on submodulesLibravatar Junio C Hamano1-12/+26
2009-03-17Merge branch 'kb/checkout-optim'Libravatar Junio C Hamano1-3/+1
2009-03-07Move local variables to narrower scopesLibravatar Benjamin Kramer1-2/+1
2009-02-09show_patch_diff(): remove a call to fstat()Libravatar Kjetil Barvik1-3/+1
2008-12-17combine-diff.c: use strbuf_readlink()Libravatar Junio C Hamano1-5/+5
2008-10-25Always initialize xpparam_t to 0Libravatar Brian Downing1-0/+1
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerLibravatar Brandon Casey1-2/+1
2008-09-18Merge branch 'jc/diff-prefix'Libravatar Junio C Hamano1-2/+6
2008-09-07Merge branch 'jc/hide-cr-in-diff-from-less'Libravatar Junio C Hamano1-2/+14
2008-08-30diff: vary default prefix depending on what are comparedLibravatar Junio C Hamano1-2/+6
2008-08-30diff: Help "less" hide ^M from the outputLibravatar Junio C Hamano1-2/+14
2008-08-24Merge branch 'maint' to sync with 1.6.0.1Libravatar Junio C Hamano1-0/+12
2008-08-23Respect core.autocrlf in combined diffLibravatar Alexander Gavrilov1-0/+12
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerLibravatar Junio C Hamano1-5/+2
2008-08-13Make xdi_diff_outf interface for running xdiff_outf diffsLibravatar Brian Downing1-3/+2
2008-06-22Merge branch 'jc/maint-combine-diff-pre-context'Libravatar Junio C Hamano1-2/+5
2008-06-18diff -c/--cc: do not include uninteresting deletion before leading contextLibravatar Junio C Hamano1-2/+5
2008-05-03Cleanup xread() loops to use read_in_full()Libravatar Heikki Orsila1-9/+8
2008-05-03Remove dead code: show_log() sep argument and diff_options.msg_sepLibravatar Adam Simpkins1-3/+3
2008-04-27Die for an early EOF in a file reading loopLibravatar Heikki Orsila1-3/+3
2007-12-26Fix rewrite_diff() name quoting.Libravatar Junio C Hamano1-10/+1
2007-12-26combine-diff: Fix path quotingLibravatar Junio C Hamano1-10/+31
2007-12-13xdl_diff: identify call sites.Libravatar Junio C Hamano1-1/+1
2007-11-11Make the diff_options bitfields be an unsigned with explicit masks.Libravatar Pierre Habouzit1-5/+5
2007-09-20Full rework of quote_c_style and write_name_quoted.Libravatar Pierre Habouzit1-14/+2
2007-07-06Future-proof source for changes in xdemitconf_tLibravatar Johannes Schindelin1-2/+1
2007-05-15Ensure return value from xread() is always stored into an ssize_tLibravatar Johan Herland1-1/+1
2007-04-22Support 'diff=pgm' attributeLibravatar Junio C Hamano1-0/+1
2007-03-07Cast 64 bit off_t to 32 bit size_tLibravatar Shawn O. Pearce1-2/+2
2007-03-03Tell multi-parent diff about core.symlinks.Libravatar Johannes Sixt1-0/+10
2007-02-27convert object type handling from a string to a numberLibravatar Nicolas Pitre1-3/+3
2007-02-27diff --cc: integer overflow given a 2GB-or-larger fileLibravatar Jim Meyering1-3/+3
2007-02-25diff --cc: fix display of symlink conflicts during a merge.Libravatar Junio C Hamano1-4/+21
2007-02-03combine-diff: special case --unified=0Libravatar Junio C Hamano1-4/+30
2006-10-26Merge branch 'jc/combined'Libravatar Junio C Hamano1-4/+8
2006-10-26combine-diff: honour --no-commit-idLibravatar Junio C Hamano1-3/+3
2006-10-26combine-diff: fix hunk_comment_line logic.Libravatar Junio C Hamano1-1/+5
2006-10-26Merge branch 'jc/combined'Libravatar Junio C Hamano1-5/+43
2006-10-26combine-diff: a few more finishing touches.Libravatar Junio C Hamano1-5/+43
2006-10-13diff --numstatLibravatar Junio C Hamano1-3/+6
2006-08-23Convert memcpy(a,b,20) to hashcpy(a,b).Libravatar Shawn Pearce1-5/+5
2006-08-17Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.Libravatar David Rientjes1-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 22:30:05 +0000