path: root/combine-diff.c
AgeCommit message (Expand)Author
2011-08-18Merge branch 'jc/maint-combined-diff-work-tree'Junio C Hamano
2011-08-04diff -c/--cc: do not mistake "resolved as deletion" as "use working tree"Junio C Hamano
2011-05-24combine-diff: respect textconv attributesJeff King
2011-05-23combine-diff: handle binary files as binaryJeff King
2011-05-23combine-diff: calculate mode_differs earlierJeff King
2011-05-23combine-diff: split header printing into its own functionJeff King
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano
2010-05-04remove ecb parameter from xdi_diff_outf()René Scharfe
2010-05-02git diff too slow for a fileRené Scharfe
2010-04-17combined diff: correctly handle truncated fileThomas Rast
2009-11-28Give the hunk comment its own colorBert Wesarg
2009-07-23Merge branch 'maint'Junio C Hamano
2009-07-22diff --cc: a lost line at the beginning of the file is shown incorrectlyJunio C Hamano
2009-07-22combine-diff.c: fix performance problem when folding common deleted linesJunio C Hamano
2009-06-27Use die_errno() instead of die() when checking syscallsThomas Rast
2009-05-01Fix a bunch of pointer declarations (codestyle)Felipe Contreras
2009-04-29Merge branch 'maint'Junio C Hamano
2009-04-29Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano
2009-04-29diff -c -p: do not die on submodulesJunio C Hamano
2009-03-18Merge branch 'kb/checkout-optim'Junio C Hamano
2009-03-08Move local variables to narrower scopesBenjamin Kramer
2009-02-10show_patch_diff(): remove a call to fstat()Kjetil Barvik
2008-12-17combine-diff.c: use strbuf_readlink()Junio C Hamano
2008-10-25Always initialize xpparam_t to 0Brian Downing
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey
2008-09-19Merge branch 'jc/diff-prefix'Junio C Hamano
2008-09-08Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano
2008-08-31diff: vary default prefix depending on what are comparedJunio C Hamano
2008-08-31diff: Help "less" hide ^M from the outputJunio C Hamano
2008-08-24Merge branch 'maint' to sync with C Hamano
2008-08-24Respect core.autocrlf in combined diffAlexander Gavrilov
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano
2008-08-14Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing
2008-06-22Merge branch 'jc/maint-combine-diff-pre-context'Junio C Hamano
2008-06-19diff -c/--cc: do not include uninteresting deletion before leading contextJunio C Hamano
2008-05-04Cleanup xread() loops to use read_in_full()Heikki Orsila
2008-05-03Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins
2008-04-28Die for an early EOF in a file reading loopHeikki Orsila
2007-12-27Fix rewrite_diff() name quoting.Junio C Hamano
2007-12-27combine-diff: Fix path quotingJunio C Hamano
2007-12-14xdl_diff: identify call sites.Junio C Hamano
2007-11-12Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit
2007-09-21Full rework of quote_c_style and write_name_quoted.Pierre Habouzit
2007-07-06Future-proof source for changes in xdemitconf_tJohannes Schindelin
2007-05-16Ensure return value from xread() is always stored into an ssize_tJohan Herland
2007-04-23Support 'diff=pgm' attributeJunio C Hamano
2007-03-07Cast 64 bit off_t to 32 bit size_tShawn O. Pearce
2007-03-04Tell multi-parent diff about core.symlinks.Johannes Sixt
2007-02-27convert object type handling from a string to a numberNicolas Pitre