aboutsummaryrefslogtreecommitdiff
path: root/combine-diff.c
Commit message (Expand)AuthorAge
...
* | | 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
|\ \ \ | |/ /
| * | combine-diff: a few more finishing touches.Junio C Hamano2006-10-26
* | | diff --numstatJunio C Hamano2006-10-13
|/ /
* | Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-23
* | Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-17
* | make inline is_null_sha1 globalDavid Rientjes2006-08-15
* | Remove combine-diff.c::uninteresting()Junio C Hamano2006-08-14
* | Fix type of combine-diff.c::show_patch_diff()Junio C Hamano2006-08-13
* | combine-diff: use colorJunio C Hamano2006-08-10
* | Substitute xmalloc()+memset(0) with xcalloc().Peter Eriksen2006-07-25
* | Fix more typos, primarily in the codePavel Roskin2006-07-10
* | Merge branch 'th/diff'Junio C Hamano2006-07-05
|\ \
| * | combine-diff.c: type sanity.Junio C Hamano2006-06-28
| * | Fix some more diff options changes.Junio C Hamano2006-06-27
| * | Add msg_sep to diff_optionsTimo Hirvonen2006-06-26
| * | Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen2006-06-26
* | | combine-diff.c: type sanityJunio C Hamano2006-06-28
|/ /
* | git diff: support "-U" and "--unified" options properlyLinus Torvalds2006-05-14
* | built-in diff: assorted updates.Junio C Hamano2006-04-29
* | Merge branch 'lt/logopt'Junio C Hamano2006-04-18
|\ \ | |/ |/|