summaryrefslogtreecommitdiff
path: root/builtin-apply.c
Commit message (Expand)AuthorAgeFilesLines
* 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
* Make apply --binary a no-op.Junio C Hamano2006-09-071-14/+5
* Replace uses of strdup with xstrdup.Shawn Pearce2006-09-021-1/+1
* free(NULL) is perfectly valid.Junio C Hamano2006-08-271-4/+2
* Merge branch 'jc/apply'Junio C Hamano2006-08-271-25/+153
|\
| * git-apply --reject: finishing touches.Junio C Hamano2006-08-271-1/+1
| * apply --reject: count hunks starting from 1, not 0Junio C Hamano2006-08-221-1/+1
| * git-apply --verboseJunio C Hamano2006-08-181-2/+36
| * git-apply --reject: send rejects to .rej files.Junio C Hamano2006-08-181-32/+50
| * git-apply --rejectJunio C Hamano2006-08-171-22/+94
| * apply --reverse: tie it all together.Junio C Hamano2006-08-161-1/+1
| * builtin-apply --reverse: two bugfixes.Junio C Hamano2006-08-161-3/+7
* | use name[len] in switch directly, instead of creating a shadowed variable.Pierre Habouzit2006-08-231-3/+1
* | avoid to use error that shadows the function name, use err instead.Pierre Habouzit2006-08-231-3/+3
|/
* remove unnecessary initializationsDavid Rientjes2006-08-151-14/+14
* make inline is_null_sha1 globalDavid Rientjes2006-08-151-6/+1
* git-apply --binary: clean up and prepare for --reverseJunio C Hamano2006-08-151-65/+141
* git-apply --reverse: simplify reverse option.Junio C Hamano2006-08-141-16/+12
* Better error message when we are unable to lock the index fileJunio C Hamano2006-08-121-5/+2
* builtin-apply: remove unused incrementJunio C Hamano2006-08-101-3/+1
* git-apply: applying a patch to make a symlink shorter.Junio C Hamano2006-08-091-0/+11
* Call setup_git_directory() much earlierLinus Torvalds2006-07-291-1/+1
* git-apply -R: binary patches are irreversible for now.Junio C Hamano2006-07-281-0/+6
* Teach git-apply about '-R'Johannes Schindelin2006-07-281-10/+55
* Fix t4114 on cygwinJohannes Schindelin2006-07-231-1/+1
* apply: handle type-changing patch correctly.Junio C Hamano2006-07-171-5/+24
* apply: split out removal and creation into different phases.Junio C Hamano2006-07-161-7/+17
* apply: check D/F conflicts more carefully.Junio C Hamano2006-07-161-3/+18
* Avoid C99 comments, use old-style C comments instead.Pavel Roskin2006-07-101-10/+11
* Fix more typos, primarily in the codePavel Roskin2006-07-101-2/+2
* Close the index file between writing and committingJohannes Schindelin2006-07-081-1/+1
* apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.Johannes Schindelin2006-06-241-9/+16
* Remove all void-pointer arithmetic.Florian Forster2006-06-201-3/+3
* Make index file locking code reusable to others.Junio C Hamano2006-06-061-5/+9
* Merge branch 'lt/apply'Junio C Hamano2006-05-281-0/+17
|\
| * Merge branch 'master' into lt/applyJunio C Hamano2006-05-241-0/+17
View Lorry Controller Status