summaryrefslogtreecommitdiff
path: root/builtin-apply.c
AgeCommit message (Expand)Author
2006-12-20simplify inclusion of system header files.Junio C Hamano
2006-11-24Merge branch 'jc/numstat'Junio C Hamano
2006-11-18git-apply: slightly clean up bitfield usageRene Scharfe
2006-11-15apply --numstat: mark binary diffstat with - -, not 0 0Junio C Hamano
2006-11-05Merge branch 'maint'Junio C Hamano
2006-11-05Use ULONG_MAX rather than implicit cast of -1.Shawn O. Pearce
2006-11-04Merge branch 'maint'Junio C Hamano
2006-11-04apply: handle "traditional" creation/deletion diff correctly.Junio C Hamano
2006-10-20Merge branch 'maint'Junio C Hamano
2006-10-20git-apply: prepare for upcoming GNU diff -u format change.Linus Torvalds
2006-10-19Merge early part of branch 'jc/diff-apply-patch'Junio C Hamano
2006-10-14Add hash_sha1_file()Rene Scharfe
2006-10-12apply --numstat -z: line termination fix.Junio C Hamano
2006-09-30git-diff/git-apply: make diff output a bit friendlier to GNU patch (part 1)Junio C Hamano
2006-09-24git-apply: second war on whitespace.Junio C Hamano
2006-09-17apply --unidiff-zero: loosen sanity checks for --unidiff=0 patchesJunio C Hamano
2006-09-07Make apply --binary a no-op.Junio C Hamano
2006-09-02Replace uses of strdup with xstrdup.Shawn Pearce
2006-08-28free(NULL) is perfectly valid.Junio C Hamano
2006-08-28Merge branch 'jc/apply'Junio C Hamano
2006-08-27git-apply --reject: finishing touches.Junio C Hamano
2006-08-24use name[len] in switch directly, instead of creating a shadowed variable.Pierre Habouzit
2006-08-24avoid to use error that shadows the function name, use err instead.Pierre Habouzit
2006-08-22apply --reject: count hunks starting from 1, not 0Junio C Hamano
2006-08-18git-apply --verboseJunio C Hamano
2006-08-18git-apply --reject: send rejects to .rej files.Junio C Hamano
2006-08-17git-apply --rejectJunio C Hamano
2006-08-17apply --reverse: tie it all together.Junio C Hamano
2006-08-17builtin-apply --reverse: two bugfixes.Junio C Hamano
2006-08-16remove unnecessary initializationsDavid Rientjes
2006-08-15make inline is_null_sha1 globalDavid Rientjes
2006-08-15git-apply --binary: clean up and prepare for --reverseJunio C Hamano
2006-08-15git-apply --reverse: simplify reverse option.Junio C Hamano
2006-08-13Better error message when we are unable to lock the index fileJunio C Hamano
2006-08-10builtin-apply: remove unused incrementJunio C Hamano
2006-08-10git-apply: applying a patch to make a symlink shorter.Junio C Hamano
2006-07-29Call setup_git_directory() much earlierLinus Torvalds
2006-07-28git-apply -R: binary patches are irreversible for now.Junio C Hamano
2006-07-28Teach git-apply about '-R'Johannes Schindelin
2006-07-24Fix t4114 on cygwinJohannes Schindelin
2006-07-17apply: handle type-changing patch correctly.Junio C Hamano
2006-07-17apply: split out removal and creation into different phases.Junio C Hamano
2006-07-17apply: check D/F conflicts more carefully.Junio C Hamano
2006-07-10Avoid C99 comments, use old-style C comments instead.Pavel Roskin
2006-07-10Fix more typos, primarily in the codePavel Roskin
2006-07-08Close the index file between writing and committingJohannes Schindelin
2006-06-25apply: replace NO_ACCURATE_DIFF with --inaccurate-eof runtime flag.Johannes Schindelin
2006-06-20Remove all void-pointer arithmetic.Florian Forster
2006-06-06Make index file locking code reusable to others.Junio C Hamano
2006-05-29Merge branch 'lt/apply'Junio C Hamano