aboutsummaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAge
* Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-13
|\
| * git diff too slow for a fileRené Scharfe2010-05-02
* | remove ecb parameter from xdi_diff_outf()René Scharfe2010-05-04
|/
* combined diff: correctly handle truncated fileThomas Rast2010-04-17
* Give the hunk comment its own colorBert Wesarg2009-11-28
* Merge branch 'maint'Junio C Hamano2009-07-22
|\
| * diff --cc: a lost line at the beginning of the file is shown incorrectlyJunio C Hamano2009-07-22
| * combine-diff.c: fix performance problem when folding common deleted linesJunio C Hamano2009-07-22
* | Use die_errno() instead of die() when checking syscallsThomas Rast2009-06-27
|/
* Fix a bunch of pointer declarations (codestyle)Felipe Contreras2009-05-01
* Merge branch 'maint'Junio C Hamano2009-04-29
|\
| * Merge branch 'maint-1.6.0' into maint-1.6.1Junio C Hamano2009-04-29
| |\
| | * diff -c -p: do not die on submodulesJunio C Hamano2009-04-29
* | | Merge branch 'kb/checkout-optim'Junio C Hamano2009-03-17
|\ \ \
| * | | show_patch_diff(): remove a call to fstat()Kjetil Barvik2009-02-09
| |/ /
* | | Move local variables to narrower scopesBenjamin Kramer2009-03-07
|/ /
* | combine-diff.c: use strbuf_readlink()Junio C Hamano2008-12-17
* | Always initialize xpparam_t to 0Brian Downing2008-10-25
* | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-12
* | Merge branch 'jc/diff-prefix'Junio C Hamano2008-09-18
|\ \
| * | diff: vary default prefix depending on what are comparedJunio C Hamano2008-08-30
* | | Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano2008-09-07
|\ \ \ | | |/ | |/|
| * | diff: Help "less" hide ^M from the outputJunio C Hamano2008-08-30
| |/
* | Merge branch 'maint' to sync with 1.6.0.1Junio C Hamano2008-08-24
|\ \ | |/
| * Respect core.autocrlf in combined diffAlexander Gavrilov2008-08-23
* | xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano2008-08-14
* | Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing2008-08-13
|/
* Merge branch 'jc/maint-combine-diff-pre-context'Junio C Hamano2008-06-22
|\
| * diff -c/--cc: do not include uninteresting deletion before leading contextJunio C Hamano2008-06-18
* | Cleanup xread() loops to use read_in_full()Heikki Orsila2008-05-03
* | Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins2008-05-03
* | Die for an early EOF in a file reading loopHeikki Orsila2008-04-27
|/
* Fix rewrite_diff() name quoting.Junio C Hamano2007-12-26
* combine-diff: Fix path quotingJunio C Hamano2007-12-26
* xdl_diff: identify call sites.Junio C Hamano2007-12-13
* Make the diff_options bitfields be an unsigned with explicit masks.Pierre Habouzit2007-11-11
* Full rework of quote_c_style and write_name_quoted.Pierre Habouzit2007-09-20
* Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-06
* Ensure return value from xread() is always stored into an ssize_tJohan Herland2007-05-15
* Support 'diff=pgm' attributeJunio C Hamano2007-04-22
* Cast 64 bit off_t to 32 bit size_tShawn O. Pearce2007-03-07
* Tell multi-parent diff about core.symlinks.Johannes Sixt2007-03-03
* convert object type handling from a string to a numberNicolas Pitre2007-02-27
* diff --cc: integer overflow given a 2GB-or-larger fileJim Meyering2007-02-27
* diff --cc: fix display of symlink conflicts during a merge.Junio C Hamano2007-02-25
* combine-diff: special case --unified=0Junio C Hamano2007-02-03
* Merge branch 'jc/combined'Junio C Hamano2006-10-26
|\
| * combine-diff: honour --no-commit-idJunio C Hamano2006-10-26
| * combine-diff: fix hunk_comment_line logic.Junio C Hamano2006-10-26
* | Merge branch 'jc/combined'Junio C Hamano2006-10-26
|\ \ | |/
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-02 09:47:11 +0000