merge: loosen overcautious "working file will be lost" check.
[gitweb.git] / builtin-apply.c
2006-10-27 Merge branch 'maint'
2006-10-26 Merge branch 'jc/combined'
2006-10-26 Merge branch 'jc/combined'
2006-10-25 Merge branch 'maint'
2006-10-25 Merge branch 'aw/cvsimport'
2006-10-25 Merge for-each-ref to sync gitweb fully with 'next'
2006-10-25 Merge branch 'jc/web-blame'
2006-10-25 Merge branch 'maint'
2006-10-24 Merge branch 'master' into jc/web
2006-10-24 Merge branch 'maint'
2006-10-23 Merge branch 'np/pack'
2006-10-23 Merge branch 'maint'
2006-10-20 Merge branch 'maint'
2006-10-20 Merge branch 'maint'
2006-10-20 git-apply: prepare for upcoming GNU diff -u format...
2006-10-19 Merge branch 'mw/pathinfo'
2006-10-19 Merge branch 'js/diff'
2006-10-19 Merge branch 'jc/send-email'
2006-10-19 Merge branch 'jc/grep'
2006-10-19 Merge early part of branch 'jc/diff-apply-patch'
2006-10-19 Merge branch 'jc/diff-numstat'
2006-10-19 Merge branch 'mw/send-email'
2006-10-19 Merge branch 'rs/rebase'
2006-10-19 Merge branch 'sb/fetch'
2006-10-19 Merge branch 'sk/svn'
2006-10-19 Merge branch 'rs/zip'
2006-10-17 Merge branch 'maint'
2006-10-15 Merge branch 'jc/http' v1.4.3-rc3
2006-10-14 Add hash_sha1_file()
2006-10-12 apply --numstat -z: line termination fix.
2006-10-02 Merge branch 'maint'
2006-10-01 Merge branch 'maint'
2006-10-01 Merge branch 'jc/gitpm'
2006-10-01 Merge branch 'jc/diff-stat'
2006-10-01 Merge branch 'lt/web'
2006-09-30 git-diff/git-apply: make diff output a bit friendlier...
2006-09-28 Merge branch 'jl/virtual'
2006-09-28 Merge branch 'cc/branch-test'
2006-09-28 Merge branch 'sp/void'
2006-09-28 Merge branch 'jc/whitespace'
2006-09-24 git-apply: second war on whitespace.
2006-09-18 Merge branch 'sk/ftp'
2006-09-18 Merge part of branch 'jc/upload-pack'
2006-09-18 Merge branch 'jc/pack'
2006-09-18 Merge branch 'jc/am'
2006-09-18 Merge branch 'jk/diff'
2006-09-17 Merge branch 'jc/archive'
2006-09-17 apply --unidiff-zero: loosen sanity checks for --unidif...
2006-09-14 Merge branches 'maint' and 'jc/http'
2006-09-13 Merge branch 'jc/unpack'
2006-09-13 Merge branch 'jc/binary'
2006-09-07 Make apply --binary a no-op.
2006-09-07 Merge branch 'jc/daemon'
2006-09-03 Merge branch 'master' into cc/trace
2006-09-02 Replace uses of strdup with xstrdup.
2006-09-01 Merge git://git.kernel.org/pub/scm/gitk/gitk
2006-08-28 Merge branch 'gl/web'
2006-08-28 free(NULL) is perfectly valid.
2006-08-28 Merge branch 'gl/cleanup-next'
2006-08-28 Merge branch 'js/c-merge-recursive'
2006-08-28 Merge branch 'ts/daemon'
2006-08-28 Merge branch 'jc/apply'
2006-08-27 git-apply --reject: finishing touches.
2006-08-26 Merge branch 'master' into gl/web
2006-08-26 Merge branch 'gl/cleanup'
2006-08-24 use name[len] in switch directly, instead of creating...
2006-08-24 avoid to use error that shadows the function name,...
2006-08-23 Merge branch 'gl/cleanup' into gl/cleanup-next
2006-08-22 apply --reject: count hunks starting from 1, not 0
2006-08-21 Merge branch 'maint'
2006-08-18 git-apply --verbose
2006-08-18 git-apply --reject: send rejects to .rej files.
2006-08-17 git-apply --reject
2006-08-17 apply --reverse: tie it all together.
2006-08-17 builtin-apply --reverse: two bugfixes.
2006-08-17 Merge branch 'jc/format-patch'
2006-08-16 Merge branch 'jc/racy'
2006-08-16 Merge branch 'maint'
2006-08-16 remove unnecessary initializations
2006-08-16 Merge branch 'maint'
2006-08-15 make inline is_null_sha1 global
2006-08-15 Merge branch 'master' into pb/gitpm
2006-08-15 git-apply --binary: clean up and prepare for --reverse
2006-08-15 git-apply --reverse: simplify reverse option.
2006-08-13 Merge branch 'jc/upload-pack'
2006-08-13 Merge branch 'jc/racy-delay'
2006-08-13 Merge branch 'th/diff-extra'
2006-08-13 Merge branch 'jc/pack-objects'
2006-08-13 Merge branch 'js/read-tree'
2006-08-13 Merge branch 'js/http-mb'
2006-08-13 Merge branch 'js/color-diff'
2006-08-13 Merge branch 'jn/web'
2006-08-13 Merge branch 'lt/web'
2006-08-13 Merge branch 'jn/conf'
2006-08-13 Merge branch 'jc/grep'
2006-08-13 Merge branch 'mk/rename'
2006-08-13 Merge branch 'ml/pager'
2006-08-13 Merge branch 'master' into js/c-merge-recursive
2006-08-13 GIT 1.4.2 v1.4.2
2006-08-13 Merge git://git.kernel.org/pub/scm/gitk/gitk
next