merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t1010-mktree.sh
2010-09-06 Merge branch 'xx/trivial' into maint
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-01 Merge branch 'en/rebase-against-rebase-fix' into maint
2010-08-22 Merge branch 'nd/fix-sparse-checkout'
2010-08-22 Merge branch 'en/rebase-against-rebase-fix'
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-18 Merge branch 'sp/fix-smart-http-deadlock-on-error'...
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-13 Merge branch 'sp/fix-smart-http-deadlock-on-error'
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-07-26 Merge branch 'maint-1.6.6' into maint-1.7.0
2010-07-16 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jc/diff-merge-base-multi'
2010-07-09 Merge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07 Merge branch 'maint-1.6.4' into maint
2010-07-07 Merge branch 'tr/receive-pack-aliased-update-fix' into...
2010-06-22 Merge branch 'pc/remove-warn' into maint
2010-06-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-06-21 Merge branch 'eb/core-eol'
2010-06-21 Merge branch 'fg/autocrlf'
2010-06-21 Merge branch 'tr/receive-pack-aliased-update-fix'
2010-06-21 Merge branch 'js/async-thread'
2010-06-21 Merge branch 'bg/apply-blank-trailing-context' into...
2010-06-18 Merge branch 'rc/ls-remote-default'
2010-06-18 Merge branch 'hg/id-munging'
2010-06-16 Merge branch 'cw/maint-exec-defpath' into maint
2010-06-16 Merge branch 'sc/http-late-auth' into maint
2010-06-16 Merge branch 'jn/t7006-fixup' into maint
2010-06-16 Merge branch 'np/index-pack-memsave' into maint
2010-06-16 Merge branch 'sp/maint-dumb-http-pack-reidx' into maint
2010-06-16 Merge branch 'jc/am-3-show-corrupted-patch' into maint
2010-06-16 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-06-16 Merge branch 'np/malloc-threading' into maint
2010-06-16 Merge branch 'bg/send-email-smtpdomain' into maint
2010-06-16 Merge branch 'rc/maint-curl-helper' into maint
2010-06-16 Merge branch 'hg/maint-attr-fix' into maint
2010-06-16 Merge branch 'mh/status-optionally-refresh' into maint
2010-06-13 Merge branch 'js/try-to-free-stackable'
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'jn/t7006-fixup'
2010-05-21 Merge branch 'js/maint-receive-pack-symref-alias'
2010-05-21 Merge branch 'sp/maint-dumb-http-pack-reidx'
2010-05-21 Merge branch 'jn/submodule-basic-test'
2010-05-21 Merge branch 'np/index-pack-memsave'
2010-05-21 Merge branch 'jc/am-3-show-corrupted-patch'
2010-05-21 Merge branch 'jc/maint-no-reflog-expire-unreach-for...
2010-05-21 Merge branch 'cw/maint-exec-defpath'
2010-05-21 Merge branch 'tr/word-diff'
2010-05-21 Merge branch 'sp/maint-describe-tiebreak-with-tagger...
2010-05-21 Merge branch 'jc/status-show-ignored'
2010-05-21 Merge branch 'np/malloc-threading'
2010-05-21 Merge branch 'sr/remote-helper-export'
2010-05-21 Merge branch 'ld/discovery-limit-to-fs' (early part)
2010-05-21 Merge branch 'ar/config-from-command-line'
2010-05-21 Merge branch 'em/checkout-orphan'
2010-05-09 Merge branch 'bg/apply-blank-trailing-context'
2010-05-09 Merge branch 'bg/send-email-smtpdomain'
2010-05-09 Merge branch 'rc/ls-remote-default'
2010-05-09 Merge branch 'rc/maint-curl-helper'
2010-05-09 Merge branch 'hg/maint-attr-fix'
2010-05-09 Merge branch 'eb/unpretty-b-format'
2010-05-09 Merge branch 'ab/commit-empty-message'
2010-05-09 Merge branch 'jc/test-sleepless'
2010-05-09 Merge branch 'jc/maint-reflog-expire-unreachable'
2010-05-09 Merge branch 'sd/log-decorate'
2010-05-09 Merge branch 'mh/status-optionally-refresh'
2010-05-09 Merge branch 'cw/ws-indent-with-tab'
2010-05-09 Merge branch 'cc/revert-strategy'
2010-05-09 Merge branch 'sc/http-late-auth'
2010-05-09 Merge branch 'jk/cached-textconv'
2010-05-09 Merge branch 'pc/remove-warn'
2010-04-23 Merge branch 'mg/use-default-abbrev-length-in-rev-list...
2010-04-23 Merge branch 'wp/doc-filter-direction' into maint
2010-04-23 Merge branch 'jk/maint-diffstat-overflow' into maint
2010-04-23 Merge branch 'da/maint-python-startup' into maint
2010-04-19 Merge branch 'maint-1.6.6' into maint
2010-04-19 Merge branch 'rr/remote-helper-doc'
2010-04-19 Merge branch 'wp/doc-filter-direction'
2010-04-19 Merge branch 'jk/maint-diffstat-overflow'
2010-04-19 Merge branch 'jg/auto-initialize-notes-with-percent...
2010-04-19 Merge git://git.kernel.org/pub/scm/gitk/gitk
2010-04-17 Merge branch 'maint'
2010-04-17 t1010-mktree: Adjust expected result to code and docume...
2010-04-11 Merge branch 'rc/maint-reflog-msg-for-forced-branch...
2010-04-10 Merge branch 'rc/maint-reflog-msg-for-forced-branch'
2010-03-31 Merge branch 'jc/maint-refs-dangling' into maint
2010-03-24 Merge branch 'jc/maint-refs-dangling'
2010-03-24 Merge branch 'jc/color-attrs' into maint
2010-03-20 Merge branch 'jc/color-attrs'
2010-03-08 Merge branch 'fn/maint-mkdtemp-compat' into maint
2010-03-08 Merge branch 'jk/maint-push-tracking-wo-remote' into...
2010-03-07 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...
2010-03-07 Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6
2010-03-07 Merge branch 'tr/maint-cherry-pick-list' into maint...
2010-03-07 Merge branch 'fn/maint-mkdtemp-compat'
2010-03-07 Merge branch 'jk/maint-push-tracking-wo-remote'
2010-03-05 Merge branch 'tr/maint-cherry-pick-list' into maint
2010-03-05 Merge branch 'gf/maint-sh-setup-nongit-ok' into maint
2010-03-02 Merge branch 'tr/maint-cherry-pick-list'
2010-03-02 Merge branch 'gf/maint-sh-setup-nongit-ok'
next