aboutsummaryrefslogtreecommitdiff
path: root/builtin-apply.c
Commit message (Expand)AuthorAge
* git-apply: do not fix whitespaces on context lines.Junio C Hamano2007-02-27
* Do not take mode bits from index after type change.Junio C Hamano2007-02-16
* apply --cached: fix crash in subdirectoryJohannes Schindelin2007-01-20
* git-apply: Remove directories that have become empty after deleting a file.Alexandre Julliard2007-01-09
* Merge branch 'maint'Junio C Hamano2007-01-09
|\
| * Fix "Do not ignore a detected patchfile brokenness."Junio C Hamano2007-01-09
| * Do not ignore a detected patchfile brokenness.Junio C Hamano2007-01-09
* | simplify inclusion of system header files.Junio C Hamano2006-12-20
* | Merge branch 'jc/numstat'Junio C Hamano2006-11-24
|\ \ | |/ |/|
| * apply --numstat: mark binary diffstat with - -, not 0 0Junio C Hamano2006-11-14
* | git-apply: slightly clean up bitfield usageRene Scharfe2006-11-18
|/
* Merge branch 'maint'Junio C Hamano2006-11-04
|\
| * Use ULONG_MAX rather than implicit cast of -1.Shawn O. Pearce2006-11-04
* | Merge branch 'maint'Junio C Hamano2006-11-04
|\ \ | |/
| * apply: handle "traditional" creation/deletion diff correctly.Junio C Hamano2006-11-04
* | Merge branch 'maint'Junio C Hamano2006-10-19
|\ \ | |/
| * git-apply: prepare for upcoming GNU diff -u format change.Linus Torvalds2006-10-19
* | Merge early part of branch 'jc/diff-apply-patch'Junio C Hamano2006-10-18
|\ \ | |/ |/|
| * git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)Junio C Hamano2006-09-29
* | Add hash_sha1_file()Rene Scharfe2006-10-14
* | apply --numstat -z: line termination fix.Junio C Hamano2006-10-12
|/
* git-apply: second war on whitespace.Junio C Hamano2006-09-24
* apply --unidiff-zero: loosen sanity checks for --unidiff=0 patchesJunio C Hamano2006-09-17
* Make apply --binary a no-op.Junio C Hamano2006-09-07
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-02
* free(NULL) is perfectly valid.Junio C Hamano2006-08-27
* Merge branch 'jc/apply'Junio C Hamano2006-08-27
|\
| * git-apply --reject: finishing touches.Junio C Hamano2006-08-27
| * apply --reject: count hunks starting from 1, not 0Junio C Hamano2006-08-22
| * git-apply --verboseJunio C Hamano2006-08-18
| * git-apply --reject: send rejects to .rej files.Junio C Hamano2006-08-18
| * git-apply --rejectJunio C Hamano2006-08-17
| * apply --reverse: tie it all together.Junio C Hamano2006-08-16
| * builtin-apply --reverse: two bugfixes.Junio C Hamano2006-08-16
* | use name[len] in switch directly, instead of creating a shadowed variable.Pierre Habouzit2006-08-23
* | avoid to use error that shadows the function name, use err instead.Pierre Habouzit2006-08-23
|/
* remove unnecessary initializationsDavid Rientjes2006-08-15
* make inline is_null_sha1 globalDavid Rientjes2006-08-15
* git-apply --binary: clean up and prepare for --reverseJunio C Hamano2006-08-15
* git-apply --reverse: simplify reverse option.Junio C Hamano2006-08-14
* Better error message when we are unable to lock the index fileJunio C Hamano2006-08-12
* builtin-apply: remove unused incrementJunio C Hamano2006-08-10
* git-apply: applying a patch to make a symlink shorter.Junio C Hamano2006-08-09
* Call setup_git_directory() much earlierLinus Torvalds2006-07-29
* git-apply -R: binary patches are irreversible for now.Junio C Hamano2006-07-28
* Teach git-apply about '-R'Johannes Schindelin2006-07-28
* Fix t4114 on cygwinJohannes Schindelin2006-07-23
* apply: handle type-changing patch correctly.Junio C Hamano2006-07-17
* apply: split out removal and creation into different phases.Junio C Hamano2006-07-16
* apply: check D/F conflicts more carefully.Junio C Hamano2006-07-16