merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t3301-notes.sh
2010-07-21 t/: work around one-shot variable assignment with test_...
2010-07-20 Convert "! git" to "test_must_fail git"
2010-07-16 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jn/paginate-fix'
2010-07-15 Merge branch 'jc/diff-merge-base-multi'
2010-07-15 Merge branch 'jn/grep-open'
2010-07-09 Merge remote branch 'ko/master' into jc/read-tree-cache...
2010-07-07 Merge branch 'ab/tap'
2010-07-07 Merge branch 'maint-1.6.4' into maint
2010-07-07 Merge branch 'mg/doc-rev-parse-treepath-syntax' into...
2010-07-07 Merge branch 'tr/receive-pack-aliased-update-fix' into...
2010-06-30 Merge branch 'ar/decorate-color'
2010-06-30 Merge branch 'mg/doc-rev-parse-treepath-syntax'
2010-06-30 Merge branch 'cc/cherry-pick-stdin'
2010-06-30 Merge branch 'jl/status-ignore-submodules'
2010-06-30 Merge branch 'jk/url-decode'
2010-06-30 Merge branch 'jn/grep-open'
2010-06-30 Merge branch 'jp/string-list-api-cleanup'
2010-06-30 Merge branch 'tr/rev-list-count'
2010-06-30 Merge branch 'as/maint-completion-set-u-fix'
2010-06-30 Merge branch 'mg/rev-parse-tests'
2010-06-30 Merge branch 'jl/maint-diff-ignore-submodules'
2010-06-29 Merge branch 'maint'
2010-06-28 Merge branch 'tr/send-email-8bit' into maint
2010-06-28 Merge branch 'pb/maint-perl-errmsg-no-dir' into maint
2010-06-28 Merge branch 'js/maint-am-rebase-invalid-author' into...
2010-06-28 Merge branch 'jc/maint-simpler-common-prefix' into...
2010-06-28 Merge branch 'bd/maint-unpack-trees-parawalk-fix' into...
2010-06-28 notes: check number of parameters to "git notes copy"
2010-06-22 Merge branch 'tc/commit-abbrev-fix' into maint
2010-06-22 Merge branch 'cc/maint-diff-CC-binary' into maint
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 'tc/commit-abbrev-fix'
2010-06-21 Merge branch 'tr/receive-pack-aliased-update-fix'
2010-06-21 Merge branch 'js/async-thread'
2010-06-21 Merge branch 'cb/assume-unchanged-fix' into maint
2010-06-21 Merge branch 'rs/diff-no-minimal' into maint
2010-06-21 Merge branch 'bg/apply-blank-trailing-context' into...
2010-06-18 Merge branch 'cc/maint-diff-CC-binary'
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 'cb/maint-stash-orphaned-file' into maint
2010-06-16 Merge branch 'jn/maint-bundle' into maint
2010-06-16 Merge branch 'rr/doc-submitting' into maint
2010-06-16 Merge branch 'jn/t7006-fixup' into maint
2010-06-16 Merge branch 'jn/shortlog' 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-06-13 Merge branch 'cb/assume-unchanged-fix'
2010-06-13 Merge branch 'rs/diff-no-minimal'
2010-06-01 Merge branch 'maint-1.7.0' into maint
2010-05-28 Merge branch 'maint-1.7.0' into maint
2010-05-21 Merge branch 'cb/maint-stash-orphaned-file'
2010-05-21 Merge branch 'jn/maint-bundle'
2010-05-21 Merge branch 'rr/doc-submitting'
2010-05-21 Merge branch 'jn/gitweb-our-squelch'
2010-05-21 Merge branch 'jn/shortlog'
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'
next