summaryrefslogtreecommitdiff
path: root/diff.c
AgeCommit message (Expand)AuthorFilesLines
2009-05-03Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1Libravatar Junio C Hamano1-1/+9
2009-03-22diff --cached: do not borrow from a work tree when a path is marked as assume...Libravatar Junio C Hamano1-1/+9
2009-01-27Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into jc/maint-split-diff-me...Libravatar Junio C Hamano1-66/+80
2009-01-27diff.c: output correct index lines for a split diffLibravatar Junio C Hamano1-66/+80
2009-01-21Rename diff.suppress-blank-empty to diff.suppressBlankEmptyLibravatar Johannes Schindelin1-1/+3
2008-12-18Fix type-mismatch compiler warning from diff_populate_filespec()Libravatar René Scharfe1-1/+2
2008-12-17Make 'prepare_temp_file()' ignore st_size for symlinksLibravatar Linus Torvalds1-5/+4
2008-12-17Make 'diff_populate_filespec()' use the new 'strbuf_readlink()'Libravatar Linus Torvalds1-9/+7
2008-12-09diff: respect textconv in rewrite diffsLibravatar Jeff King1-12/+36
2008-12-09diff: fix handling of binary rewrite diffsLibravatar Jeff King1-1/+3
2008-12-07diff: allow turning on textconv explicitly for plumbingLibravatar Jeff King1-0/+4
2008-11-12Merge branch 'jk/diff-convfilter'Libravatar Junio C Hamano1-25/+45
2008-11-12Merge branch 'jk/diff-convfilter-test-fix'Libravatar Junio C Hamano1-1/+1
2008-11-08Merge branch 'rs/blame'Libravatar Junio C Hamano1-0/+5
2008-10-26only textconv regular filesLibravatar Jeff King1-0/+2
2008-10-26userdiff: require explicitly allowing textconvLibravatar Jeff King1-15/+11
2008-10-26refactor userdiff textconv codeLibravatar Jeff King1-13/+35
2008-10-26diff: add missing static declarationLibravatar Jeff King1-1/+1
2008-10-25Always initialize xpparam_t to 0Libravatar Brian Downing1-0/+5
2008-10-18diff: add filter for converting binary to textLibravatar Jeff King1-2/+47
2008-10-18diff: introduce diff.<driver>.binaryLibravatar Jeff King1-30/+22
2008-10-18diff: unify external diff and funcname parsing codeLibravatar Jeff King1-224/+27
2008-10-12Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializerLibravatar Brandon Casey1-10/+5
2008-10-06Teach git diff about Objective-C syntaxLibravatar Jonathan del Strother1-0/+10
2008-10-06Merge branch 'maint'Libravatar Shawn O. Pearce1-0/+4
2008-10-06fix bogus "diff --git" header from "diff --no-index"Libravatar Linus Torvalds1-0/+4
2008-10-02fix openssl headers conflicting with custom SHA1 implementationsLibravatar Nicolas Pitre1-6/+6
2008-09-30diff.c: remove duplicate bibtex pattern introduced by merge 92bb9785Libravatar Brandon Casey1-2/+0
2008-09-29Merge branch 'bc/master-diff-hunk-header-fix'Libravatar Shawn O. Pearce1-46/+60
2008-09-29Merge branch 'maint' into bc/master-diff-hunk-header-fixLibravatar Shawn O. Pearce1-11/+1
2008-09-29Merge branch 'bc/maint-diff-hunk-header-fix' into maintLibravatar Shawn O. Pearce1-43/+55
2008-09-25Merge branch 'ho/dirstat-by-file'Libravatar Shawn O. Pearce1-1/+9
2008-09-23t4018-diff-funcname: test syntax of builtin xfuncname patternsLibravatar Brandon Casey1-1/+1
2008-09-20Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixLibravatar Junio C Hamano1-1/+3
2008-09-20diff hunk pattern: fix misconverted "\{" tex macro introducersLibravatar Junio C Hamano1-2/+2
2008-09-20diff: fix "multiple regexp" semantics to find hunk header commentLibravatar Junio C Hamano1-1/+1
2008-09-19diff: use extended regexp to find hunk headersLibravatar Junio C Hamano1-3/+3
2008-09-19Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixLibravatar Junio C Hamano1-14/+17
2008-09-19diff: use extended regexp to find hunk headersLibravatar Junio C Hamano1-14/+17
2008-09-18Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fixLibravatar Junio C Hamano1-39/+55
2008-09-18Merge branch 'jc/diff-prefix'Libravatar Junio C Hamano1-6/+40
2008-09-18diff.*.xfuncname which uses "extended" regex's for hunk header selectionLibravatar Brandon Casey1-0/+5
2008-09-18diff.c: associate a flag with each pattern and use it for compiling regexLibravatar Brandon Casey1-9/+12
2008-09-18diff.c: return pattern entry pointer rather than just the hunk header patternLibravatar Brandon Casey1-27/+28
2008-09-18Merge branch 'jc/maint-diff-quiet' into maintLibravatar Junio C Hamano1-11/+1
2008-09-16Merge branch 'jc/maint-diff-quiet'Libravatar Junio C Hamano1-11/+1
2008-09-10Merge branch 'jc/maint-hide-cr-in-diff-from-less' into maintLibravatar Junio C Hamano1-1/+8
2008-09-07Merge branch 'jc/hide-cr-in-diff-from-less'Libravatar Junio C Hamano1-1/+8
2008-09-07Teach "git diff -p" to locate PHP class methodsLibravatar Andreas Ericsson1-0/+1
2008-09-06diff --quiet: make it synonym to --exit-code >/dev/nullLibravatar Junio C Hamano1-10/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 19:46:10 +0000