aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft2007-01-08
* Merge branch 'sp/mmap'Junio C Hamano2007-01-07
|\
| * Replace mmap with xmmap, better handling MAP_FAILED.Shawn O. Pearce2006-12-29
* | diff-index --cached --raw: show tree entry on the LHS for unmerged entries.Junio C Hamano2007-01-06
|/
* Merge branch 'maint'Junio C Hamano2006-12-21
|\
| * diff --check: fix off by one errorJohannes Schindelin2006-12-21
* | simplify inclusion of system header files.Junio C Hamano2006-12-20
* | fix populate-filespecJunio C Hamano2006-12-19
* | make commit message a little more consistent and confortingNicolas Pitre2006-12-15
* | Avoid accessing a slow working copy during diffcore operations.Shawn O. Pearce2006-12-15
* | Merge branch 'jc/numstat'Junio C Hamano2006-12-13
|\ \
| * | diff --numstat: show binary with '-' to match "apply --numstat"Junio C Hamano2006-12-11
| |/
* | Allow subcommand.color and color.subcommand color configurationAndy Parkins2006-12-13
|/
* Merge branch 'js/diff'Junio C Hamano2006-10-18
|\
| * Turn on recursive with --summaryJohannes Schindelin2006-10-05
* | diff --numstatJunio C Hamano2006-10-13
|/
* Merge branch 'jc/diff-stat'Junio C Hamano2006-09-30
|\
| * diff --stat: ensure at least one '-' for deletions, and one '+' for additionsJohannes Schindelin2006-09-28
| * diff --stat=width[,name-width]: allow custom diffstat output width.Linus Torvalds2006-09-28
| * diff --stat: color output.Junio C Hamano2006-09-27
| * diff --stat: allow custom diffstat output width.Junio C Hamano2006-09-27
* | git-diff -B output fix.Junio C Hamano2006-09-29
* | diff.c: second war on whitespace.Junio C Hamano2006-09-24
|/
* Merge branch 'jk/diff'Junio C Hamano2006-09-17
|\
| * Move color option parsing out of diff.c and into color.[ch]Jeff King2006-09-08
| * diff: support custom callbacks for outputJeff King2006-09-07
* | diff --binary generates full index on binary files.Junio C Hamano2006-09-07
|/
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-02
* Merge branch 'jc/apply'Junio C Hamano2006-08-27
|\
| * diff.c: make binary patch reversible.Junio C Hamano2006-08-16
* | 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
|/
* remove unnecessary initializationsDavid Rientjes2006-08-15
* make inline is_null_sha1 globalDavid Rientjes2006-08-15
* diff.c cleanupDavid Rientjes2006-08-14
* Merge branch 'th/diff-extra'Junio C Hamano2006-08-12
|\
| * --name-only, --name-status, --check and -s are mutually exclusiveTimo Hirvonen2006-07-01
* | Add the --color-words option to the diff options familyJohannes Schindelin2006-08-10
* | allow diff.renamelimit to be set regardless of -M/-Cv1.4.2-rc4Junio C Hamano2006-08-09
* | make --find-copies-harder imply -CJunio C Hamano2006-08-09
* | diff.c: do not use pathname comparison to tell renamesJunio C Hamano2006-08-03
* | pager: config variable pager.colorMatthias Lederhofer2006-07-31
* | Colorize 'commit' lines in log uiJeff King2006-07-24
* | diff: Support 256 colorsTimo Hirvonen2006-07-13
* | diff: Support both attributes and colorsTimo Hirvonen2006-07-13
* | Avoid C99 initializersShawn Pearce2006-07-10
* | Merge branch 'ew/diff'Junio C Hamano2006-07-09
|\ \
| * | diff: do not use configuration magic at the core-levelJunio C Hamano2006-07-08
| * | diff.c: --no-color to defeat diff.color configuration.Junio C Hamano2006-07-07
| * | diff.c: respect diff.renames config optionEric Wong2006-07-07