summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/hide-cr-in-diff-from-less'Junio C Hamano2008-09-071-1/+8
|\
| * diff: Help "less" hide ^M from the outputJunio C Hamano2008-08-301-1/+8
* | Teach "git diff -p" to locate PHP class methodsAndreas Ericsson2008-09-071-0/+1
* | Merge branch 'jc/maint-log-grep'Junio C Hamano2008-09-041-3/+6
|\ \
| * | diff --cumulative is a sub-option of --dirstatJunio C Hamano2008-09-031-3/+6
| |/
* | Merge branch 'maint'Junio C Hamano2008-08-291-0/+8
|\ \ | |/
| * Fix '--dirstat' with cross-directory renamingLinus Torvalds2008-08-291-0/+8
* | Teach "git diff -p" HTML funcname patternsJohan Herland2008-08-201-2/+3
* | Teach "git diff -p" Python funcname patternsKirill Smelkov2008-08-201-0/+1
* | Merge branch 'maint'Junio C Hamano2008-08-201-0/+1
|\ \ | |/
| * diff --check: do not get confused by new blank lines in the middleJunio C Hamano2008-08-201-0/+1
* | Merge branch 'bd/diff-strbuf'Junio C Hamano2008-08-191-27/+10
|\ \
| * | xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano2008-08-141-17/+10
| * | Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing2008-08-131-15/+5
| |/
* | add boolean diff.suppress-blank-empty config optionJim Meyering2008-08-191-0/+13
|/
* Teach git diff about BibTeX head hunk patternsGustaf Hendeby2008-08-121-0/+1
* diff --check: do not unconditionally complain about trailing empty linesJunio C Hamano2008-08-111-1/+2
* Merge branch 'maint'Junio C Hamano2008-08-051-4/+5
|\
| * diff.renamelimit is a basic diff configurationLinus Torvalds2008-08-051-4/+5
* | diff: chapter and part in funcname for texGiuseppe Bilotta2008-08-021-1/+1
* | Teach "git diff -p" Pascal/Delphi funcname patternAvery Pennarun2008-08-021-0/+6
* | diff: add ruby funcname patternGiuseppe Bilotta2008-08-021-0/+1
* | format-patch: Produce better output with --inline or --attachKevin Ballard2008-07-291-2/+1
* | Merge branch 'maint'Junio C Hamano2008-07-161-9/+2
|\ \ | |/
| * Fix buffer overflow in git diffDmitry Potapov2008-07-161-9/+2
* | Merge branch 'qq/maint'Junio C Hamano2008-07-051-6/+2
|\ \ | |/
| * diff.c: Use 'git_config_string' to get 'diff.external'Brian Hetro2008-07-051-6/+2
* | Merge branch 'jc/checkdiff'Junio C Hamano2008-07-011-20/+75
|\ \
| * | diff --check: detect leftover conflict markersJunio C Hamano2008-06-261-0/+35
| * | Teach "diff --check" about new blank lines at endJunio C Hamano2008-06-261-2/+15
| * | checkdiff: pass diff_options to the callbackJunio C Hamano2008-06-261-10/+11
| * | check_and_emit_line(): rename and refactorJunio C Hamano2008-06-261-7/+6
| * | diff --check: explain why we do not care whether old side is binaryJunio C Hamano2008-06-261-2/+9
* | | show_stats(): fix stats width calculationOlivier Marin2008-06-281-6/+6
|/ /
* | Merge branch 'maint'Junio C Hamano2008-06-261-3/+5
|\ \ | |/
| * diff --check: do not discard error status upon seeing a good lineJunio C Hamano2008-06-261-3/+5
* | Merge branch 'jk/test'Junio C Hamano2008-06-221-1/+2
|\ \ | |/ |/|
| * avoid trailing whitespace in zero-change diffstat linesJeff King2008-06-141-1/+2
* | Merge branch 'maint'Junio C Hamano2008-06-161-2/+4
|\ \
| * | diff.c: fix emit_line() again not to add extra lineJunio C Hamano2008-06-161-2/+4
* | | Merge branch 'maint'Junio C Hamano2008-06-161-0/+4
|\ \ \ | |/ / | | / | |/ |/|
| * diff: reset color before printing newlineSZEDER Gábor2008-06-161-0/+4
* | Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano2008-05-251-4/+4
|\ \
| * | Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-4/+4
* | | diff options: Introduce --ignore-submodulesJohannes Schindelin2008-05-151-0/+9
* | | Merge branch 'jk/renamelimit' (early part)Junio C Hamano2008-05-141-1/+1
|\ \ \ | |/ / |/| |
| * | bump rename limit defaultsJeff King2008-05-031-1/+1
* | | Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins2008-05-031-1/+0
|/ /
* | diff: make --dirstat binary-file safeJunio C Hamano2008-04-091-23/+60
|/
* Write diff output to a file in struct diff_optionsDaniel Barkalow2008-03-141-140/+166
View Lorry Controller Status