summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
2008-08-29Merge branch 'maint'Junio C Hamano
2008-08-29Fix '--dirstat' with cross-directory renamingLinus Torvalds
2008-08-21Teach "git diff -p" HTML funcname patternsJohan Herland
2008-08-21Teach "git diff -p" Python funcname patternsKirill Smelkov
2008-08-20Merge branch 'maint'Junio C Hamano
2008-08-20diff --check: do not get confused by new blank lines in the middleJunio C Hamano
2008-08-20Merge branch 'bd/diff-strbuf'Junio C Hamano
2008-08-20add boolean diff.suppress-blank-empty config optionJim Meyering
2008-08-14xdiff-interface: hide the whole "xdiff_emit_state" business from the callerJunio C Hamano
2008-08-14Make xdi_diff_outf interface for running xdiff_outf diffsBrian Downing
2008-08-12Teach git diff about BibTeX head hunk patternsGustaf Hendeby
2008-08-12diff --check: do not unconditionally complain about trailing empty linesJunio C Hamano
2008-08-06Merge branch 'maint'Junio C Hamano
2008-08-06diff.renamelimit is a basic diff configurationLinus Torvalds
2008-08-02diff: chapter and part in funcname for texGiuseppe Bilotta
2008-08-02Teach "git diff -p" Pascal/Delphi funcname patternAvery Pennarun
2008-08-02diff: add ruby funcname patternGiuseppe Bilotta
2008-07-30format-patch: Produce better output with --inline or --attachKevin Ballard
2008-07-17Merge branch 'maint'Junio C Hamano
2008-07-16Fix buffer overflow in git diffDmitry Potapov
2008-07-06Merge branch 'qq/maint'Junio C Hamano
2008-07-06diff.c: Use 'git_config_string' to get 'diff.external'Brian Hetro
2008-07-01Merge branch 'jc/checkdiff'Junio C Hamano
2008-06-29show_stats(): fix stats width calculationOlivier Marin
2008-06-27diff --check: detect leftover conflict markersJunio C Hamano
2008-06-27Teach "diff --check" about new blank lines at endJunio C Hamano
2008-06-27checkdiff: pass diff_options to the callbackJunio C Hamano
2008-06-27check_and_emit_line(): rename and refactorJunio C Hamano
2008-06-27diff --check: explain why we do not care whether old side is binaryJunio C Hamano
2008-06-27Merge branch 'maint'Junio C Hamano
2008-06-26diff --check: do not discard error status upon seeing a good lineJunio C Hamano
2008-06-22Merge branch 'jk/test'Junio C Hamano
2008-06-17Merge branch 'maint'Junio C Hamano
2008-06-17diff.c: fix emit_line() again not to add extra lineJunio C Hamano
2008-06-16Merge branch 'maint'Junio C Hamano
2008-06-16diff: reset color before printing newlineSZEDER Gábor
2008-06-14avoid trailing whitespace in zero-change diffstat linesJeff King
2008-05-25Merge branch 'js/config-cb'v1.5.6-rc0Junio C Hamano
2008-05-15diff options: Introduce --ignore-submodulesJohannes Schindelin
2008-05-14Merge branch 'jk/renamelimit' (early part)Junio C Hamano
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin
2008-05-03bump rename limit defaultsJeff King
2008-05-03Remove dead code: show_log() sep argument and diff_options.msg_sepAdam Simpkins
2008-04-09diff: make --dirstat binary-file safeJunio C Hamano
2008-03-14Write diff output to a file in struct diff_optionsDaniel Barkalow
2008-03-02diff: make sure work tree side is shown as 0{40} when differentJunio C Hamano
2008-03-02Clean up find_unique_abbrev() callersJunio C Hamano
2008-02-27Merge branch 'jm/free'Junio C Hamano
2008-02-27Merge branch 'jc/diff-relative'Junio C Hamano
2008-02-26Merge branch 'maint'Junio C Hamano