summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2008-07-29format-patch: Produce better output with --inline or --attachLibravatar Kevin Ballard1-2/+1
2008-07-16Merge branch 'maint'Libravatar Junio C Hamano1-9/+2
2008-07-16Fix buffer overflow in git diffLibravatar Dmitry Potapov1-9/+2
2008-07-05Merge branch 'qq/maint'Libravatar Junio C Hamano1-6/+2
2008-07-05diff.c: Use 'git_config_string' to get 'diff.external'Libravatar Brian Hetro1-6/+2
2008-07-01Merge branch 'jc/checkdiff'Libravatar Junio C Hamano1-20/+75
2008-06-28show_stats(): fix stats width calculationLibravatar Olivier Marin1-6/+6
2008-06-26diff --check: detect leftover conflict markersLibravatar Junio C Hamano1-0/+35
2008-06-26Teach "diff --check" about new blank lines at endLibravatar Junio C Hamano1-2/+15
2008-06-26checkdiff: pass diff_options to the callbackLibravatar Junio C Hamano1-10/+11
2008-06-26check_and_emit_line(): rename and refactorLibravatar Junio C Hamano1-7/+6
2008-06-26diff --check: explain why we do not care whether old side is binaryLibravatar Junio C Hamano1-2/+9
2008-06-26Merge branch 'maint'Libravatar Junio C Hamano1-3/+5
2008-06-26diff --check: do not discard error status upon seeing a good lineLibravatar Junio C Hamano1-3/+5
2008-06-22Merge branch 'jk/test'Libravatar Junio C Hamano1-1/+2
2008-06-16Merge branch 'maint'Libravatar Junio C Hamano1-2/+4
2008-06-16diff.c: fix emit_line() again not to add extra lineLibravatar Junio C Hamano1-2/+4
2008-06-16Merge branch 'maint'Libravatar Junio C Hamano1-0/+4
2008-06-16diff: reset color before printing newlineLibravatar SZEDER Gábor1-0/+4
2008-06-14avoid trailing whitespace in zero-change diffstat linesLibravatar Jeff King1-1/+2
2008-05-25Merge branch 'js/config-cb'Libravatar Junio C Hamano1-4/+4
2008-05-15diff options: Introduce --ignore-submodulesLibravatar Johannes Schindelin1-0/+9
2008-05-14Merge branch 'jk/renamelimit' (early part)Libravatar Junio C Hamano1-1/+1
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-4/+4
2008-05-03bump rename limit defaultsLibravatar Jeff King1-1/+1
2008-05-03Remove dead code: show_log() sep argument and diff_options.msg_sepLibravatar Adam Simpkins1-1/+0
2008-04-09diff: make --dirstat binary-file safeLibravatar Junio C Hamano1-23/+60
2008-03-14Write diff output to a file in struct diff_optionsLibravatar Daniel Barkalow1-140/+166
2008-03-02diff: make sure work tree side is shown as 0{40} when differentLibravatar Junio C Hamano1-5/+2
2008-03-01Clean up find_unique_abbrev() callersLibravatar Junio C Hamano1-2/+0
2008-02-27Merge branch 'jm/free'Libravatar Junio C Hamano1-6/+3
2008-02-27Merge branch 'jc/diff-relative'Libravatar Junio C Hamano1-17/+87
2008-02-26Merge branch 'maint'Libravatar Junio C Hamano1-4/+4
2008-02-25Use a single implementation and API for copy_file()Libravatar Daniel Barkalow1-4/+4
2008-02-24Merge branch 'lt/dirstat'Libravatar Junio C Hamano1-1/+94
2008-02-24diff --dirstat: saner handling of binary and unmerged filesLibravatar Junio C Hamano1-1/+6
2008-02-22Avoid unnecessary "if-before-free" tests.Libravatar Jim Meyering1-6/+3
2008-02-20diff: fix java funcname pattern for solarisLibravatar Jeff King1-1/+1
2008-02-18Add color.ui variable which globally enables colorization if setLibravatar Matthias Kestenholz1-3/+3
2008-02-16Merge branch 'sp/safecrlf'Libravatar Junio C Hamano1-1/+1
2008-02-16Merge branch 'maint'Libravatar Junio C Hamano1-14/+6
2008-02-15diff: Fix miscounting of --check outputLibravatar Junio C Hamano1-2/+2
2008-02-15diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"Libravatar Christian Couder1-5/+2
2008-02-15diff.c: remove useless check for value != NULLLibravatar Christian Couder1-7/+2
2008-02-15diff.c: replace a 'strdup' with 'xstrdup'.Libravatar Christian Couder1-1/+1
2008-02-15diff.c: fixup garding of config parser from value=NULLLibravatar Junio C Hamano1-1/+1
2008-02-13diff --relative: help working in a bare repositoryLibravatar Junio C Hamano1-0/+4
2008-02-13diff --relative: output paths as relative to the current subdirectoryLibravatar Junio C Hamano1-17/+83
2008-02-12Add "--dirstat" for some directory statisticsLibravatar Linus Torvalds1-1/+89
2008-02-11Merge branch 'lt/in-core-index'Libravatar Junio C Hamano1-9/+14