merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t2011-checkout-invalid-head.sh
2009-03-13 Merge branch 'en/maint-1.6.1-hash-object' into maint...
2009-03-13 Merge branch 'js/maint-1.6.1-remote-remove-mirror'...
2009-03-13 Merge branch 'ks/maint-1.6.0-mailinfo-folded' into...
2009-03-11 Merge branch 'fg/maint-exclude-bq' into maint
2009-03-11 Merge branch 'en/maint-hash-object' into maint
2009-03-11 Merge branch 'jc/maint-1.6.0-keep-pack'
2009-03-05 Merge branch 'en/maint-hash-object'
2009-03-05 Merge branch 'jc/blame'
2009-03-05 Merge branch 'fg/exclude-bq'
2009-03-02 Merge git://git.kernel.org/pub/scm/gitk/gitk
2009-03-01 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-28 Merge branch 'maint-1.6.0' into maint
2009-02-28 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-27 Merge branch 'cc/maint-1.6.0-bisect-fix'
2009-02-25 Merge branch 'jc/maint-1.6.0-pack-directory'
2009-02-12 Merge branch 'maint-1.6.0' into maint
2009-02-11 Merge branch 'maint-1.5.6' into maint
2009-02-11 Merge branch 'js/maint-1.6.0-path-normalize'
2009-02-10 Merge branch 'maint-1.6.0' into maint
2009-02-06 Merge branch 'js/maint-remote-remove-mirror'
2009-02-06 Merge branch 'js/notes'
2009-02-06 Merge branch 'maint-1.6.0' into maint
2009-02-06 Merge branch 'sg/maint-gitdir-in-subdir' into maint
2009-02-06 Merge branch 'lt/maint-wrap-zlib' into maint
2009-02-06 Merge branch 'js/maint-all-implies-HEAD' into maint
2009-02-06 Merge branch 'kc/maint-diff-bwi-fix' into maint
2009-02-04 Merge branch 'maint-1.6.0' into maint
2009-02-04 Merge branch 'maint-1.6.0' into maint
2009-02-03 Merge branch 'maint-1.6.0' into maint
2009-02-01 Merge branch 'ks/maint-mailinfo-folded'
2009-02-01 Merge branch 'maint-1.6.0' into maint
2009-01-29 Merge branch 'jc/maint-format-patch-o-relative' into...
2009-01-29 Merge branch 'bs/maint-rename-populate-filespec' into...
2009-01-29 Merge branch 'mh/maint-commit-color-status' into maint
2009-01-29 Merge branch 'nd/grep-assume-unchanged' into maint
2009-01-29 Merge branch 'jc/maint-ls-tree' into maint
2009-01-29 Merge branch 'np/no-loosen-prune-expire-now' into maint
2009-01-29 Merge branch 'mc/cd-p-pwd' into maint
2009-01-29 Merge branch 'maint-1.6.0' into maint
2009-01-27 Merge branch 'maint-1.6.0' into maint
2009-01-27 Merge branch 'jc/maint-1.6.0-split-diff-metainfo' into...
2009-01-26 Merge branch 'js/maint-all-implies-HEAD'
2009-01-24 Merge branch 'js/patience-diff'
2009-01-24 Merge branch 'cb/maint-unpack-trees-absense' into maint
2009-01-24 Merge branch 'tr/maint-no-index-fixes' into maint
2009-01-24 Merge branch 'rs/maint-shortlog-foldline' into maint
2009-01-24 Merge branch 'pj/maint-ldflags' into maint
2009-01-24 Merge branch 'pb/maint-git-pm-false-dir' into maint
2009-01-24 Merge branch 'js/maint-bisect-gitk' into maint
2009-01-24 Merge branch 'js/add-not-submodule' into maint
2009-01-24 Merge branch 'jc/maint-format-patch' into maint
2009-01-24 Merge branch 'maint-1.6.0' into maint
2009-01-22 Merge branch 'kc/maint-diff-bwi-fix'
2009-01-22 Merge branch 'lt/maint-wrap-zlib'
2009-01-22 Merge branch 'sg/maint-gitdir-in-subdir'
2009-01-22 Merge branch 'jc/maint-format-patch-o-relative'
2009-01-21 Merge branch 'bs/maint-rename-populate-filespec'
2009-01-20 Merge branch 'kc/maint-diff-bwi-fix'
2009-01-18 Merge branch 'ds/uintmax-config'
2009-01-18 Merge branch 'mv/apply-parse-opt'
2009-01-18 Merge branch 'tr/rebase-root'
2009-01-18 Merge branch 'gb/gitweb-patch'
2009-01-18 Merge branch 'jc/maint-format-patch'
2009-01-18 Merge branch 'tr/maint-no-index-fixes'
2009-01-18 Merge branch 'rs/maint-shortlog-foldline'
2009-01-18 Merge branch 'mh/maint-commit-color-status'
2009-01-18 Merge branch 'maint-1.6.0' into maint
2009-01-15 Merge branch 'maint-1.6.0' into maint
2009-01-15 Merge branch 'maint-1.6.0' into maint
2009-01-14 Merge branch 'maint-1.6.0' into maint
2009-01-14 Merge branch 'nd/grep-assume-unchanged'
2009-01-14 Merge branch 'as/maint-shortlog-cleanup'
2009-01-14 Merge branch 'jc/maint-ls-tree'
2009-01-14 Merge branch 'js/bundle-tags'
2009-01-14 Merge branch 'js/add-not-submodule'
2009-01-14 Merge branch 'pb/maint-git-pm-false-dir'
2009-01-14 Merge branch 'pj/maint-ldflags'
2009-01-14 Merge branch 'fe/cvsserver'
2009-01-14 Merge branch 'js/maint-bisect-gitk'
2009-01-14 Merge branch 'np/no-loosen-prune-expire-now'
2009-01-14 Merge branch 'cb/maint-unpack-trees-absense'
2009-01-14 Merge branch 'mc/cd-p-pwd'
2009-01-14 Merge branch 'mh/cherry-default'
2009-01-13 Merge branch 'kk/maint-http-push' into maint
2009-01-13 Merge branch 'js/maint-merge-recursive-r-d-conflict...
2009-01-13 Merge branch 'cb/maint-merge-recursive-fix' into maint
2009-01-13 Merge branch 'ap/maint-apply-modefix' into maint
2009-01-13 Merge branch 'maint-1.6.0' into maint
2009-01-12 Merge branch 'mh/maint-sendmail-cc-doc' into maint
2009-01-12 Merge branch 'jc/maint-do-not-switch-to-non-commit...
2009-01-07 Merge branch 'mh/maint-sendmail-cc-doc'
2009-01-07 Merge branch 'rs/diff-ihc'
2009-01-07 Merge branch 'js/maint-merge-recursive-r-d-conflict'
2009-01-07 Merge branch 'mk/gitweb-feature'
2009-01-07 Merge branch 'cb/merge-recursive-fix'
2009-01-07 Merge branch 'kk/maint-http-push'
2009-01-07 Merge branch 'mv/um-pdf'
2009-01-07 Merge branch 'jn/gitweb-blame'
2009-01-07 Merge branch 'wp/add-p-goto'
2009-01-07 Merge branch 'maint'
next