summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* | diff --color: use reset sequence when we mean reset.Junio C Hamano2006-06-241-1/+1
|/
* Tweak diff colorsLinus Torvalds2006-06-221-41/+58
* Merge branch 'ff/c99' into nextJunio C Hamano2006-06-211-1/+1
|\
| * Remove all void-pointer arithmetic.Florian Forster2006-06-201-1/+1
* | diff options: add --colorJohannes Schindelin2006-06-171-9/+70
|/
* Merge branch 'js/fmt-patch'Junio C Hamano2006-05-241-1/+5
|\
| * fmt-patch: Support --attachJohannes Schindelin2006-05-211-1/+5
* | --summary output should print immediately after stats.Sean2006-05-231-1/+4
* | Avoid segfault in diff --stat rename output.Sean2006-05-221-1/+1
* | diff: minor option combination fix.Junio C Hamano2006-05-221-0/+8
* | checkdiff_consume: strtol parameter fix.Junio C Hamano2006-05-211-1/+1
|/
* diff family: add --check optionJohannes Schindelin2006-05-211-1/+114
* Merge branch 'se/diff'Junio C Hamano2006-05-151-1/+87
|\
| * Add "--summary" option to git diff.Sean2006-05-141-1/+87
* | Merge branch 'lt/diff'Junio C Hamano2006-05-151-1/+51
|\ \
| * | git diff: support "-U" and "--unified" options properlyLinus Torvalds2006-05-141-1/+51
| |/
* | diffstat rename squashing fix.Junio C Hamano2006-05-141-2/+7
|/
* Merge branch 'jc/bindiff'Junio C Hamano2006-05-091-7/+107
|\
| * binary diff: further updates.Junio C Hamano2006-05-051-63/+71
| * binary patch.Junio C Hamano2006-05-051-7/+99
* | Merge branch 'fix'Junio C Hamano2006-05-081-1/+1
|\ \ | |/ |/|
| * Fix "git diff --stat" with long filenamesLinus Torvalds2006-05-081-1/+1