summaryrefslogtreecommitdiff
path: root/builtin-apply.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jc/attr'Junio C Hamano2007-04-211-11/+7
|\
| * Simplify calling of CR/LF conversion routinesAlex Riesen2007-04-201-11/+7
* | Merge branch 'maint'Junio C Hamano2007-04-181-2/+1
|\ \ | |/ |/|
| * Fix overwriting of files when applying contextually independent diffsAlex Riesen2007-04-181-2/+1
* | Merge branch 'jc/index-output'Junio C Hamano2007-04-071-3/+3
|\ \
| * | _GIT_INDEX_OUTPUT: allow plumbing to output to an alternative index file.Junio C Hamano2007-04-031-3/+3
* | | Merge branch 'maint'Junio C Hamano2007-04-051-2/+2
|\ \ \ | | |/ | |/|
| * | Honor -p<n> when applying git diffsShawn O. Pearce2007-04-051-2/+2
| |/
* | Rename static variable write_index to update_index in builtin-apply.cJunio C Hamano2007-04-051-6/+6
|/
* git-apply: Do not free the wrong buffer when we convert the data for writeoutJunio C Hamano2007-03-221-7/+10
* Cast 64 bit off_t to 32 bit size_tShawn O. Pearce2007-03-071-1/+1
* Add core.symlinks to mark filesystems that do not support symbolic links.Johannes Sixt2007-03-021-1/+1
* convert object type handling from a string to a numberNicolas Pitre2007-02-271-4/+4
* Merge branch 'maint'Junio C Hamano2007-02-271-1/+2
|\
| * git-apply: do not fix whitespaces on context lines.Junio C Hamano2007-02-271-1/+2
* | Merge branch 'js/apply'Junio C Hamano2007-02-241-1/+6
|\ \
| * | apply: make --verbose a little more usefulJohannes Schindelin2007-02-221-1/+6
| | |
| \ \
*-. \ \ Merge branches 'lt/crlf' and 'jc/apply-config'Junio C Hamano2007-02-221-22/+133
|\ \ \ \
| | * | | git-apply: guess correct -p<n> value for non-git patches.Junio C Hamano2007-02-211-2/+57
| | * | | git-apply: notice "diff --git" patch againJunio C Hamano2007-02-211-7/+16
| | * | | Fix botched "leak fix"Junio C Hamano2007-02-211-2/+8
| | * | | apply: fix memory leak in prefix_one()Johannes Schindelin2007-02-191-6/+9
| | * | | git-apply: require -p<n> when working in a subdirectory.Junio C Hamano2007-02-191-14/+28
| | * | | git-apply: do not lose cwd when run from a subdirectory.Junio C Hamano2007-02-191-4/+4
| | * | | Teach 'git apply' to look at $HOME/.gitconfig even outside of a repositoryJunio C Hamano2007-02-181-5/+3
| | * | | Teach 'git apply' to look at $GIT_DIR/configJunio C Hamano2007-02-171-8/+13
| | |/ /
| * | | Teach core.autocrlf to 'git apply'Junio C Hamano2007-02-171-6/+28
| |/ /
* | | Mechanical conversion to use prefixcmp()Junio C Hamano2007-02-201-6/+6
| |/ |/|
* | Do not take mode bits from index after type change.Junio C Hamano2007-02-161-1/+1
|/
* apply --cached: fix crash in subdirectoryJohannes Schindelin2007-01-201-1/+1
* git-apply: Remove directories that have become empty after deleting a file.Alexandre Julliard2007-01-091-2/+13
* Merge branch 'maint'Junio C Hamano2007-01-091-1/+2
|\
| * Fix "Do not ignore a detected patchfile brokenness."Junio C Hamano2007-01-091-1/+2
| * Do not ignore a detected patchfile brokenness.Junio C Hamano2007-01-091-1/+1
* | simplify inclusion of system header files.Junio C Hamano2006-12-201-1/+0
* | Merge branch 'jc/numstat'Junio C Hamano2006-11-241-1/+5
|\ \ | |/ |/|
| * apply --numstat: mark binary diffstat with - -, not 0 0Junio C Hamano2006-11-141-1/+5
* | git-apply: slightly clean up bitfield usageRene Scharfe2006-11-181-2/+5
|/
* Merge branch 'maint'Junio C Hamano2006-11-041-1/+1
|\
| * Use ULONG_MAX rather than implicit cast of -1.Shawn O. Pearce2006-11-041-1/+1
* | Merge branch 'maint'Junio C Hamano2006-11-041-2/+6
|\ \ | |/
| * apply: handle "traditional" creation/deletion diff correctly.Junio C Hamano2006-11-041-2/+6
* | Merge branch 'maint'Junio C Hamano2006-10-191-0/+9
|\ \ | |/
| * git-apply: prepare for upcoming GNU diff -u format change.Linus Torvalds2006-10-191-0/+9
* | Merge early part of branch 'jc/diff-apply-patch'Junio C Hamano2006-10-181-2/+2
|\ \ | |/ |/|
| * git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)Junio C Hamano2006-09-291-2/+2
* | Add hash_sha1_file()Rene Scharfe2006-10-141-6/+2
* | apply --numstat -z: line termination fix.Junio C Hamano2006-10-121-1/+1
|/
* git-apply: second war on whitespace.Junio C Hamano2006-09-241-25/+97
* apply --unidiff-zero: loosen sanity checks for --unidiff=0 patchesJunio C Hamano2006-09-171-33/+79
View Lorry Controller Status