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