summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* has_sha1_pack(): refactor "pretend these packs do not exist" interfaceJunio C Hamano2009-02-281-1/+1
* fix bogus "diff --git" header from "diff --no-index"Linus Torvalds2008-10-061-0/+4
* Merge branch 'bc/maint-diff-hunk-header-fix' into maintShawn O. Pearce2008-09-291-43/+55
|\
| * diff hunk pattern: fix misconverted "\{" tex macro introducersJunio C Hamano2008-09-201-2/+2
| * diff: use extended regexp to find hunk headersJunio C Hamano2008-09-191-14/+17
| * diff.*.xfuncname which uses "extended" regex's for hunk header selectionBrandon Casey2008-09-181-0/+5
| * diff.c: associate a flag with each pattern and use it for compiling regexBrandon Casey2008-09-181-9/+12
| * diff.c: return pattern entry pointer rather than just the hunk header patternBrandon Casey2008-09-181-27/+28
* | Merge branch 'jc/maint-diff-quiet' into maintJunio C Hamano2008-09-181-11/+1
|\ \ | |/ |/|
| * diff --quiet: make it synonym to --exit-code >/dev/nullJunio C Hamano2008-09-061-10/+0
| * diff Porcelain: do not disable auto index refreshing on -C -CJunio C Hamano2008-09-061-1/+1
* | Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maintJunio C Hamano2008-09-101-1/+8
|\ \ | |/ |/|
| * diff: Help "less" hide ^M from the outputJunio C Hamano2008-08-301-1/+8
* | diff --cumulative is a sub-option of --dirstatJunio C Hamano2008-09-031-3/+6
|/
* Fix '--dirstat' with cross-directory renamingLinus Torvalds2008-08-291-0/+8
* diff --check: do not get confused by new blank lines in the middleJunio C Hamano2008-08-201-0/+1
* Teach git diff about BibTeX head hunk patternsGustaf Hendeby2008-08-121-0/+1
* diff --check: do not unconditionally complain about trailing empty linesJunio C Hamano2008-08-111-1/+2
* Merge branch 'maint'Junio C Hamano2008-08-051-4/+5
|\
| * diff.renamelimit is a basic diff configurationLinus Torvalds2008-08-051-4/+5
* | diff: chapter and part in funcname for texGiuseppe Bilotta2008-08-021-1/+1
* | Teach "git diff -p" Pascal/Delphi funcname patternAvery Pennarun2008-08-021-0/+6
* | diff: add ruby funcname patternGiuseppe Bilotta2008-08-021-0/+1
* | 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
|/
View Lorry Controller Status