summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/diff'Junio C Hamano2006-09-171-132/+7
|\
| * Move color option parsing out of diff.c and into color.[ch]Jeff King2006-09-081-132/+4
| * diff: support custom callbacks for outputJeff King2006-09-071-0/+3
* | diff --binary generates full index on binary files.Junio C Hamano2006-09-071-1/+7
|/
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-021-2/+2
* Merge branch 'jc/apply'Junio C Hamano2006-08-271-2/+8
|\
| * diff.c: make binary patch reversible.Junio C Hamano2006-08-161-2/+8
* | Convert memcpy(a,b,20) to hashcpy(a,b).Shawn Pearce2006-08-231-3/+3
* | Do not use memcmp(sha1_1, sha1_2, 20) with hardcoded length.David Rientjes2006-08-171-5/+5
|/
* remove unnecessary initializationsDavid Rientjes2006-08-151-2/+2
* make inline is_null_sha1 globalDavid Rientjes2006-08-151-1/+1
* diff.c cleanupDavid Rientjes2006-08-141-3/+1
* Merge branch 'th/diff-extra'Junio C Hamano2006-08-121-0/+13
|\
| * --name-only, --name-status, --check and -s are mutually exclusiveTimo Hirvonen2006-07-011-0/+13
* | Add the --color-words option to the diff options familyJohannes Schindelin2006-08-101-6/+172
* | allow diff.renamelimit to be set regardless of -M/-Cv1.4.2-rc4Junio C Hamano2006-08-091-3/+0
* | make --find-copies-harder imply -CJunio C Hamano2006-08-091-3/+4
* | diff.c: do not use pathname comparison to tell renamesJunio C Hamano2006-08-031-5/+1
* | pager: config variable pager.colorMatthias Lederhofer2006-07-311-1/+1
* | Colorize 'commit' lines in log uiJeff King2006-07-241-17/+11
* | diff: Support 256 colorsTimo Hirvonen2006-07-131-6/+18
* | diff: Support both attributes and colorsTimo Hirvonen2006-07-131-57/+107
* | Avoid C99 initializersShawn Pearce2006-07-101-6/+6
* | Merge branch 'ew/diff'Junio C Hamano2006-07-091-1/+23
|\ \
| * | diff: do not use configuration magic at the core-levelJunio C Hamano2006-07-081-1/+7
| * | diff.c: --no-color to defeat diff.color configuration.Junio C Hamano2006-07-071-0/+2
| * | diff.c: respect diff.renames config optionEric Wong2006-07-071-0/+14
* | | "git -p cmd" to page anywhereJunio C Hamano2006-07-091-1/+1
* | | Merge branch 'sf/diff'Junio C Hamano2006-07-091-1/+4
|\ \ \ | |/ /
| * | Teach diff -a as shorthand for --textStephan Feder2006-07-071-1/+1
| * | Teach --text option to diffStephan Feder2006-07-071-1/+4
* | | colored diff: diff.color = auto fixJunio C Hamano2006-07-071-2/+8
|/ /
* | Do not drop data from '\0' until eol in patch outputStephan Feder2006-07-071-1/+3
* | Merge branch 'th/diff'Junio C Hamano2006-07-051-96/+125
|\ \ | |/
| * Fix some more diff options changes.Junio C Hamano2006-06-271-7/+8
| * Fix diff-tree -sTimo Hirvonen2006-06-271-3/+0
| * Print empty line between raw, stat, summary and patchTimo Hirvonen2006-06-271-5/+42
| * Don't xcalloc() struct diffstat_tTimo Hirvonen2006-06-261-6/+5
| * Add msg_sep to diff_optionsTimo Hirvonen2006-06-261-0/+1
| * Set default diff output format after parsing command lineTimo Hirvonen2006-06-261-1/+0
| * Make --raw option available for all diff commandsTimo Hirvonen2006-06-261-0/+2
| * Merge with_raw, with_stat and summary variables to output_formatTimo Hirvonen2006-06-261-95/+88
* | Make zlib compression level configurable, and change default.Joachim B Haga2006-07-031-1/+1
* | diff.c: fix get_patch_id()Junio C Hamano2006-06-281-1/+1
* | add diff_flush_patch_id() to calculate the patch idJohannes Schindelin2006-06-261-0/+139
|/
* Merge branch 'jc/diff'Junio C Hamano2006-06-261-14/+80
|\
| * diff --color: use $GIT_DIR/configJunio C Hamano2006-06-251-14/+80
* | Merge branch 'js/diff'Junio C Hamano2006-06-261-4/+9
|\ \ | |/ |/|
| * Teach diff about -b and -w flagsJohannes Schindelin2006-06-231-4/+9
* | Clean up diff.cTimo Hirvonen2006-06-241-12/+6
View Lorry Controller Status