summaryrefslogtreecommitdiff
path: root/diff.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maintJunio C Hamano2009-04-081-1/+9
|\
| * diff --cached: do not borrow from a work tree when a path is marked as assume...Junio C Hamano2009-03-221-1/+9
* | Merge branch 'jc/maint-1.6.0-keep-pack' into maintJunio C Hamano2009-04-081-1/+1
|\ \
| * | has_sha1_pack(): refactor "pretend these packs do not exist" interfaceJunio C Hamano2009-02-281-1/+1
* | | Smudge the files fed to external diff and textconvJohannes Schindelin2009-03-221-3/+10
* | | Remove redundant bit clears from diff_setup()Keith Cascio2009-02-131-3/+0
* | | Bugfix: GIT_EXTERNAL_DIFF with more than one changed filesNazri Ramliy2009-02-121-4/+4
* | | Merge branch 'jc/maint-split-diff-metainfo'Junio C Hamano2009-01-311-66/+80
|\ \ \
| * \ \ Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Junio C Hamano2009-01-271-66/+80
| |\ \ \
| | * | | diff.c: output correct index lines for a split diffJunio C Hamano2009-01-271-66/+80
| | |/ /
* | | | Merge branch 'jk/signal-cleanup'Junio C Hamano2009-01-311-52/+56
|\ \ \ \
| * | | | refactor signal handling for cleanup functionsJeff King2009-01-211-1/+1
| * | | | chain kill signals for cleanup functionsJeff King2009-01-211-2/+3
| * | | | diff: refactor tempfile cleanup handlingJeff King2009-01-211-52/+55
* | | | | Merge branch 'js/diff-color-words'Junio C Hamano2009-01-251-70/+155
|\ \ \ \ \
| * | | | | color-words: Support diff.wordregex config optionBoyd Stephen Smith Jr2009-01-211-0/+5
| * | | | | color-words: make regex configurable via attributesThomas Rast2009-01-171-0/+10
| * | | | | color-words: enable REG_NEWLINE to help userThomas Rast2009-01-171-1/+2
| * | | | | color-words: take an optional regular expression describing wordsJohannes Schindelin2009-01-171-9/+55
| * | | | | color-words: change algorithm to allow for 0-character word boundariesJohannes Schindelin2009-01-171-66/+91
| * | | | | color-words: refactor word splitting and use ALLOC_GROW()Johannes Schindelin2009-01-171-21/+19
| |/ / / /
* | | | | Merge branch 'js/patience-diff'Junio C Hamano2009-01-231-0/+2
|\ \ \ \ \
| * | | | | Introduce the diff option '--patience'Johannes Schindelin2009-01-071-0/+2
* | | | | | Merge branch 'maint'Junio C Hamano2009-01-211-1/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | Rename diff.suppress-blank-empty to diff.suppressBlankEmptyJohannes Schindelin2009-01-211-1/+3
| |/ / /
* | | | Merge branch 'rs/diff-ihc'Junio C Hamano2009-01-071-0/+4
|\ \ \ \
| * | | | diff: add option to show context between close hunksRené Scharfe2008-12-291-0/+4
| |/ / /
* | | | remove trailing LF in die() messagesAlexander Potashev2009-01-051-1/+1
|/ / /
* | | Fix type-mismatch compiler warning from diff_populate_filespec()René Scharfe2008-12-181-1/+2
* | | Make 'prepare_temp_file()' ignore st_size for symlinksLinus Torvalds2008-12-171-5/+4
* | | Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Linus Torvalds2008-12-171-9/+7
* | | diff: respect textconv in rewrite diffsJeff King2008-12-091-12/+36
* | | diff: fix handling of binary rewrite diffsJeff King2008-12-091-1/+3
* | | diff: allow turning on textconv explicitly for plumbingJeff King2008-12-071-0/+4
* | | Merge branch 'jk/diff-convfilter'Junio C Hamano2008-11-121-25/+45
|\ \ \
| * | | only textconv regular filesJeff King2008-10-261-0/+2
| * | | userdiff: require explicitly allowing textconvJeff King2008-10-261-15/+11
| * | | refactor userdiff textconv codeJeff King2008-10-261-13/+35
* | | | Merge branch 'jk/diff-convfilter-test-fix'Junio C Hamano2008-11-121-1/+1
|\ \ \ \ | |/ / /
| * | | diff: add missing static declarationJeff King2008-10-261-1/+1
* | | | Merge branch 'rs/blame'Junio C Hamano2008-11-081-0/+5
|\ \ \ \ | |/ / / |/| | |
| * | | Always initialize xpparam_t to 0Brian Downing2008-10-251-0/+5
* | | | diff: add filter for converting binary to textJeff King2008-10-181-2/+47
* | | | diff: introduce diff.<driver>.binaryJeff King2008-10-181-30/+22
* | | | diff: unify external diff and funcname parsing codeJeff King2008-10-181-224/+27
|/ / /
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerBrandon Casey2008-10-121-10/+5
* | | Teach git diff about Objective-C syntaxJonathan del Strother2008-10-061-0/+10
* | | Merge branch 'maint'Shawn O. Pearce2008-10-061-0/+4
|\ \ \ | |/ /
| * | fix bogus "diff --git" header from "diff --no-index"Linus Torvalds2008-10-061-0/+4
* | | fix openssl headers conflicting with custom SHA1 implementationsNicolas Pitre2008-10-021-6/+6
View Lorry Controller Status