summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)Author
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
2008-02-25Use a single implementation and API for copy_file()Daniel Barkalow
2008-02-25Merge branch 'lt/dirstat'Junio C Hamano
2008-02-25diff --dirstat: saner handling of binary and unmerged filesJunio C Hamano
2008-02-22Avoid unnecessary "if-before-free" tests.Jim Meyering
2008-02-21diff: fix java funcname pattern for solarisJeff King
2008-02-18Add color.ui variable which globally enables colorization if setMatthias Kestenholz
2008-02-17Merge branch 'sp/safecrlf'Junio C Hamano
2008-02-16Merge branch 'maint'Junio C Hamano
2008-02-16diff: Fix miscounting of --check outputJunio C Hamano
2008-02-16diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"Christian Couder
2008-02-16diff.c: remove useless check for value != NULLChristian Couder
2008-02-15diff.c: replace a 'strdup' with 'xstrdup'.Christian Couder
2008-02-15diff.c: fixup garding of config parser from value=NULLJunio C Hamano
2008-02-13diff --relative: help working in a bare repositoryJunio C Hamano
2008-02-13diff --relative: output paths as relative to the current subdirectoryJunio C Hamano
2008-02-12Add "--dirstat" for some directory statisticsLinus Torvalds
2008-02-12Merge branch 'lt/in-core-index'Junio C Hamano