aboutsummaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAge
* 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
* | Teach "git diff -p" to locate PHP class methodsAndreas Ericsson2008-09-07
* | Merge branch 'jc/maint-log-grep'Junio C Hamano2008-09-04
|\ \
| * | diff --cumulative is a sub-option of --dirstatJunio C Hamano2008-09-03
| |/
* | Merge branch 'maint'Junio C Hamano2008-08-29
|\ \ | |/
| * Fix '--dirstat' with cross-directory renamingLinus Torvalds2008-08-29
* | Teach "git diff -p" HTML funcname patternsJohan Herland2008-08-20
* | Teach "git diff -p" Python funcname patternsKirill Smelkov2008-08-20
* | Merge branch 'maint'Junio C Hamano2008-08-20
|\ \ | |/
| * diff --check: do not get confused by new blank lines in the middleJunio C Hamano2008-08-20
* | Merge branch 'bd/diff-strbuf'Junio C Hamano2008-08-19
|\ \
| * | 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
| |/
* | add boolean diff.suppress-blank-empty config optionJim Meyering2008-08-19
|/
* Teach git diff about BibTeX head hunk patternsGustaf Hendeby2008-08-12
* diff --check: do not unconditionally complain about trailing empty linesJunio C Hamano2008-08-11
* Merge branch 'maint'Junio C Hamano2008-08-05
|\
| * diff.renamelimit is a basic diff configurationLinus Torvalds2008-08-05
* | diff: chapter and part in funcname for texGiuseppe Bilotta2008-08-02
* | Teach "git diff -p" Pascal/Delphi funcname patternAvery Pennarun2008-08-02
* | diff: add ruby funcname patternGiuseppe Bilotta2008-08-02
* | format-patch: Produce better output with --inline or --attachKevin Ballard2008-07-29
* | Merge branch 'maint'Junio C Hamano2008-07-16
|\ \ | |/
| * Fix buffer overflow in git diffDmitry Potapov2008-07-16
* | Merge branch 'qq/maint'Junio C Hamano2008-07-05
|\ \ | |/
| * diff.c: Use 'git_config_string' to get 'diff.external'Brian Hetro2008-07-05
* | Merge branch 'jc/checkdiff'Junio C Hamano2008-07-01
|\ \
| * | diff --check: detect leftover conflict markersJunio C Hamano2008-06-26
| * | Teach "diff --check" about new blank lines at endJunio C Hamano2008-06-26
| * | checkdiff: pass diff_options to the callbackJunio C Hamano2008-06-26
| * | check_and_emit_line(): rename and refactorJunio C Hamano2008-06-26
| * | diff --check: explain why we do not care whether old side is binaryJunio C Hamano2008-06-26
* | | show_stats(): fix stats width calculationOlivier Marin2008-06-28
|/ /
* | Merge branch 'maint'Junio C Hamano2008-06-26
|\ \ | |/
| * diff --check: do not discard error status upon seeing a good lineJunio C Hamano2008-06-26
* | Merge branch 'jk/test'Junio C Hamano2008-06-22
|\ \ | |/ |/|
| * avoid trailing whitespace in zero-change diffstat linesJeff King2008-06-14
* | Merge branch 'maint'Junio C Hamano2008-06-16
|\ \
| * | diff.c: fix emit_line() again not to add extra lineJunio C Hamano2008-06-16
* | | Merge branch 'maint'Junio C Hamano2008-06-16
|\ \ \ | |/ / | | / | |/ |/|
| * diff: reset color before printing newlineSZEDER Gábor2008-06-16
* | Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano2008-05-25
|\ \
| * | Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
* | | diff options: Introduce --ignore-submodulesJohannes Schindelin2008-05-15
* | | Merge branch 'jk/renamelimit' (early part)Junio C Hamano2008-05-14
|\ \ \ | |/ / |/| |
| * | bump rename limit defaultsJeff King2008-05-03
* | | Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins2008-05-03
|/ /
* | diff: make --dirstat binary-file safeJunio C Hamano2008-04-09
|/
* Write diff output to a file in struct diff_optionsDaniel Barkalow2008-03-14