summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* diff: make sure work tree side is shown as 0{40} when differentJunio C Hamano2008-03-021-5/+2
* Clean up find_unique_abbrev() callersJunio C Hamano2008-03-011-2/+0
* Merge branch 'jm/free'Junio C Hamano2008-02-271-6/+3
|\
| * Avoid unnecessary "if-before-free" tests.Jim Meyering2008-02-221-6/+3
* | Merge branch 'jc/diff-relative'Junio C Hamano2008-02-271-17/+87
|\ \
| * | diff --relative: help working in a bare repositoryJunio C Hamano2008-02-131-0/+4
| * | diff --relative: output paths as relative to the current subdirectoryJunio C Hamano2008-02-131-17/+83
* | | Merge branch 'maint'Junio C Hamano2008-02-261-4/+4
|\ \ \
| * | | Use a single implementation and API for copy_file()Daniel Barkalow2008-02-251-4/+4
* | | | Merge branch 'lt/dirstat'Junio C Hamano2008-02-241-1/+94
|\ \ \ \ | |_|_|/ |/| | |
| * | | diff --dirstat: saner handling of binary and unmerged filesJunio C Hamano2008-02-241-1/+6
| * | | Add "--dirstat" for some directory statisticsLinus Torvalds2008-02-121-1/+89
* | | | diff: fix java funcname pattern for solarisJeff King2008-02-201-1/+1
* | | | Add color.ui variable which globally enables colorization if setMatthias Kestenholz2008-02-181-3/+3
* | | | Merge branch 'sp/safecrlf'Junio C Hamano2008-02-161-1/+1
|\ \ \ \
| * | | | safecrlf: Add mechanism to warn about irreversible crlf conversionsSteffen Prohaska2008-02-061-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'maint'Junio C Hamano2008-02-161-14/+6
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | diff: Fix miscounting of --check outputJunio C Hamano2008-02-151-2/+2
| * | diff.c: add "const" qualifier to "char *cmd" member of "struct ll_diff_driver"Christian Couder2008-02-151-5/+2
| * | diff.c: remove useless check for value != NULLChristian Couder2008-02-151-7/+2
| * | diff.c: replace a 'strdup' with 'xstrdup'.Christian Couder2008-02-151-1/+1
| * | diff.c: fixup garding of config parser from value=NULLJunio C Hamano2008-02-151-1/+1
View Lorry Controller Status