traverse_trees(): handle D/F conflict case sanely
[gitweb.git] / builtin-apply.c
2009-08-28 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-08-28 Merge branch 'maint-1.5.6' into maint-1.6.0
2009-08-28 Merge branch 'lt/block-sha1'
2009-08-27 Merge branch 'as/maint-graph-interesting-fix'
2009-08-27 Merge branch 'jh/submodule-foreach'
2009-08-27 Merge branch 'jc/maint-unpack-objects-strict'
2009-08-27 Merge branch 'wl/insta-mongoose'
2009-08-27 Merge branch 'nd/sparse' (early part)
2009-08-26 Merge branch 'maint'
2009-08-26 Merge branch 'js/maint-cover-letter-non-ascii' into...
2009-08-26 Merge branch 'jc/maint-clean-nested-dir-safety' into...
2009-08-26 Merge branch 'jk/maint-merge-msg-fix' into maint
2009-08-26 Merge branch 'jc/apply-epoch-patch' into maint
2009-08-26 Merge branch 'maint-1.6.3' into maint
2009-08-26 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix' into...
2009-08-25 Merge branch 'aj/fix-read-tree-from-scratch'
2009-08-25 Merge branch 'jc/maint-checkout-index-to-prefix'
2009-08-25 Merge branch 'jl/submodule-summary-diff-files'
2009-08-25 Merge branch 'lh/short-decorate'
2009-08-25 Merge branch 'oa/stash-na'
2009-08-24 Merge branch 'jc/verify-pack-stat'
2009-08-24 Merge branch 'mr/gitweb-xz'
2009-08-24 Merge branch 'ld/p4'
2009-08-22 Sync with 1.6.4.1
2009-08-22 Merge branch 'cc/replace'
2009-08-22 Merge branch 'gb/apply-ignore-whitespace'
2009-08-22 Merge branch 'bc/mailsplit-cr-at-eol'
2009-08-21 Merge branch 'jc/maint-merge-recursive-fix' into maint
2009-08-19 Merge branch 'rc/maint-http-fix'
2009-08-19 Merge branch 'tr/maint-1.6.3-add-p-modeonly-fix'
2009-08-18 Merge branch 'maint'
2009-08-16 Merge branch 'bc/maint-am-email'
2009-08-16 Merge branch 'js/maint-cover-letter-non-ascii'
2009-08-16 Merge branch 'jc/maint-clean-nested-dir-safety'
2009-08-16 Merge branch 'jk/maint-merge-msg-fix'
2009-08-16 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-08-14 Merge branch 'jn/gitweb-blame' (early part)
2009-08-12 Merge branch 'maint'
2009-08-12 Merge branch 'maint-1.6.3' into maint
2009-08-11 Merge branch 'maint'
2009-08-11 Merge branch 'maint-1.6.3' into maint
2009-08-11 Merge branch 'jc/maint-merge-recursive-fix'
2009-08-11 Merge branch 'zf/maint-gitweb-acname'
2009-08-11 Merge branch 'np/maint-limit-delta-cache'
2009-08-11 Merge branch 'jp/symlink-dirs'
2009-08-11 Merge branch 'mk/grep-max-depth'
2009-08-11 Merge branch 'js/run-command-updates'
2009-08-08 Merge branch 'maint'
2009-08-08 Merge branch 'maint-1.6.3' into maint
2009-08-08 Merge branch 'maint-1.6.2' into maint-1.6.3
2009-08-08 Merge branch 'maint-1.6.1' into maint-1.6.2
2009-08-08 Merge branch 'maint-1.6.0' into maint-1.6.1
2009-08-05 Merge branch 'sb/read-tree'
2009-08-05 Merge branch 'jc/apply-epoch-patch'
2009-08-05 Merge branch 'ne/futz-upload-pack'
2009-08-05 Merge branch 'maint-1.6.3' into maint
2009-08-05 git apply: option to ignore whitespace differences
2009-07-29 Merge branch 'hv/cvsps-tests'
2009-07-29 Sync with 1.6.3.4
2009-07-26 Merge branch 'gp/maint-rebase-p-onto'
2009-07-26 Merge branch 'en/fast-export'
2009-07-25 Merge branch 'maint'
2009-07-25 Merge branch 'maint'
2009-07-25 Merge branch 'js/maint-graft-unhide-true-parents'
2009-07-25 Merge branch 'av/maint-config-reader'
2009-07-25 Merge branch 'jk/maint-send-email-alias-loop'
2009-07-24 Merge branch 'maint'
2009-07-23 Merge branch 'maint'
2009-07-18 Merge branch 'maint'
2009-07-11 apply: notice creation/removal patches produced by...
2009-07-11 Merge branch 'ae/maint-mailinfo-rm-only-one-patch-marker'
2009-07-09 Merge branch 'ld/push-porcelain-output-format'
2009-07-09 Merge branch 'gb/gitweb-avatar'
2009-07-09 Merge branch 'ml/http'
2009-07-09 Merge branch 'rs/grep-p'
2009-07-09 Merge branch 'js/run-command-updates' (early part)
2009-07-08 Merge branch 'maint'
2009-07-06 Merge branch 'tr/die_errno'
2009-07-06 Merge branch 'cb/maint-fetch-refspec-wo-dst'
2009-07-06 Merge branch 'gb/am-foreign'
2009-07-06 Merge branch 'jk/use-our-regexp'
2009-07-06 Merge branch 'uk/rev-parse-parse-opt'
2009-07-02 Merge branch 'cc/bisect'
2009-07-02 Merge branch 'js/daemon-log'
2009-07-02 Merge branch 'cf/maint-remote-uploadpack-useconfig...
2009-07-02 Merge branch 'sb/quiet-porcelains'
2009-07-02 Merge branch 'ne/maint-1.6.0-diff-tree-t-r-show-directory'
2009-07-02 Merge branch 'maint'
2009-06-30 Merge branch 'maint'
2009-06-27 Merge branch 'pb/send-email-cccmd-fix'
2009-06-27 Merge branch 'maint'
2009-06-27 Use die_errno() instead of die() when checking syscalls
2009-06-27 Convert existing die(..., strerror(errno)) to die_errno()
2009-06-22 Merge branch 'maint'
2009-06-22 Merge branch 'sb/maint-1.6.0-add-config-fix' into maint
2009-06-22 Sync with 1.6.3.3
2009-06-22 Merge branch 'ak/maint-for-each-ref-no-lookup' into...
2009-06-22 Merge branch 'rc/maint-http-local-slot-fix' into maint
2009-06-22 Merge branch 'cb/maint-no-double-merge' into maint
2009-06-22 Merge branch 'pb/maint-1.6.2-userdiff-fix' into maint
next