summaryrefslogtreecommitdiff
path: root/builtin-apply.c
AgeCommit message (Expand)AuthorFilesLines
2008-07-01Merge branch 'js/apply-recount'Libravatar Junio C Hamano1-7/+68
2008-07-01Merge branch 'jc/checkdiff'Libravatar Junio C Hamano1-3/+2
2008-06-28Allow git-apply to recount the lines in a hunk (AKA recountdiff)Libravatar Johannes Schindelin1-7/+68
2008-06-27git-apply: handle a patch that touches the same path more than once betterLibravatar Don Zickus1-10/+72
2008-06-26check_and_emit_line(): rename and refactorLibravatar Junio C Hamano1-3/+2
2008-05-25Merge branch 'js/config-cb'Libravatar Junio C Hamano1-3/+3
2008-05-17builtin-apply: do not declare patch is creation when we do not know itLibravatar Junio C Hamano1-15/+0
2008-05-17builtin-apply: accept patch to an empty fileLibravatar Junio C Hamano1-56/+77
2008-05-17builtin-apply: typofixLibravatar Junio C Hamano1-1/+1
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-3/+3
2008-05-10Optimize symlink/directory detectionLibravatar Linus Torvalds1-1/+1
2008-04-16Merge branch 'maint'Libravatar Junio C Hamano1-1/+1
2008-04-16Merge branch 'maint-1.5.4' into maintLibravatar Junio C Hamano1-1/+1
2008-04-15builtin-apply: Show a more descriptive error on failure when opening a patchLibravatar Alberto Bertogli1-1/+1
2008-04-14builtin-apply.c: use git_config_string() to get apply_default_whitespaceLibravatar Stephan Beyer1-6/+2
2008-04-06Merge branch 'jc/maint-apply-match-beginning'Libravatar Junio C Hamano1-13/+16
2008-04-06Fix "git apply" to correctly enforce "match at the beginning"Libravatar Junio C Hamano1-13/+16
2008-03-26Always set *nongit_ok in setup_git_directory_gently()Libravatar SZEDER Gábor1-1/+1
2008-02-24Merge branch 'jc/apply-whitespace'Libravatar Junio C Hamano1-243/+476
2008-02-23ws_fix_copy(): move the whitespace fixing function to ws.cLibravatar Junio C Hamano1-108/+3
2008-02-16Merge branch 'sp/safecrlf'Libravatar Junio C Hamano1-1/+1
2008-02-11Merge branch 'lt/in-core-index'Libravatar Junio C Hamano1-5/+5
2008-02-11apply: do not barf on patch with too large an offsetLibravatar Junio C Hamano1-0/+3
2008-02-11builtin-apply.c: guard config parser from value=NULLLibravatar Junio C Hamano1-0/+2
2008-02-06safecrlf: Add mechanism to warn about irreversible crlf conversionsLibravatar Steffen Prohaska1-1/+1
2008-02-05core.whitespace: cr-at-eolLibravatar Junio C Hamano1-4/+14
2008-02-05git-apply --whitespace=fix: fix whitespace fuzz introduced by previous runLibravatar Junio C Hamano1-5/+128
2008-02-05builtin-apply.c: pass ws_rule down to match_fragment()Libravatar Junio C Hamano1-3/+5
2008-02-05builtin-apply.c: move copy_wsfix() function a bit higher.Libravatar Junio C Hamano1-94/+94
2008-02-05builtin-apply.c: do not feed copy_wsfix() leading '+'Libravatar Junio C Hamano1-20/+18
2008-02-05builtin-apply.c: simplify calling site to apply_line()Libravatar Junio C Hamano1-18/+20
2008-02-05builtin-apply.c: clean-up apply_one_fragment()Libravatar Junio C Hamano1-28/+27
2008-02-05builtin-apply.c: mark common context lines in lineinfo structure.Libravatar Junio C Hamano1-25/+32
2008-02-05builtin-apply.c: optimize match_beginning/end processing a bit.Libravatar Junio C Hamano1-0/+10
2008-02-05builtin-apply.c: make it more line orientedLibravatar Junio C Hamano1-123/+280
2008-02-05builtin-apply.c: push match-beginning/end logic downLibravatar Junio C Hamano1-14/+32
2008-02-05builtin-apply.c: restructure "offset" matchingLibravatar Junio C Hamano1-24/+25
2008-02-05builtin-apply.c: refactor small part that matches contextLibravatar Junio C Hamano1-5/+13
2008-01-21Make on-disk index representation separate from in-core oneLibravatar Linus Torvalds1-5/+5
2008-01-16Improve use of lockfile APILibravatar Brandon Casey1-1/+1
2008-01-08"git-apply --check" should not report "fixed"Libravatar Junio C Hamano1-1/+1
2007-12-16builtin-apply: stronger indent-with-on-tab fixingLibravatar J. Bruce Fields1-2/+1
2007-12-16builtin-apply: minor cleanup of whitespace detectionLibravatar J. Bruce Fields1-4/+4
2007-12-13Make "diff --check" output match "git apply"Libravatar Wincent Colaiuta1-2/+2
2007-12-13Unify whitespace checkingLibravatar Wincent Colaiuta1-44/+10
2007-12-09Merge branch 'jc/spht'Libravatar Junio C Hamano1-83/+155
2007-12-06Use gitattributes to define per-path whitespace ruleLibravatar Junio C Hamano1-14/+22
2007-11-24core.whitespace: documentation updates.Libravatar Junio C Hamano1-1/+1
2007-11-24builtin-apply: teach whitespace_rulesLibravatar Junio C Hamano1-19/+49
2007-11-23builtin-apply: rename "whitespace" variables and fix stylesLibravatar Junio C Hamano1-57/+91