merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t4111-apply-subdir.sh
2010-09-08 Merge branch 'jk/test-must-fail-missing'
2010-09-08 Merge branch 'jh/error-removing-missing-note'
2010-09-08 Merge branch 'kf/askpass-config'
2010-09-08 Merge branch 'bc/maint-fetch-url-only'
2010-09-08 Merge branch 'jk/maint-pass-c-config-in-env'
2010-09-08 Merge branch 'en/d-f-conflict-fix'
2010-09-07 Merge branch 'maint'
2010-09-06 Merge branch 'jh/clean-exclude'
2010-09-06 Merge branch 'maint' v1.7.3-rc0
2010-09-04 Merge branch 'jl/submodule-ignore-diff'
2010-09-04 Merge branch 'ab/test-2'
2010-09-04 Merge branch 'js/detached-stash'
2010-09-04 Merge branch 'js/maint-reflog-beyond-horizon'
2010-09-04 Merge branch 'dg/local-mod-error-messages'
2010-09-04 Merge branch 'nd/maint-fix-replace'
2010-09-03 Merge branch 'ab/compat-regex'
2010-09-03 Merge branch 'nd/clone-depth-zero'
2010-09-03 Merge branch 'jn/maint-doc-user-manual-html-doctype'
2010-09-03 Merge branch 'cb/maint-mergetool-no-tty'
2010-09-03 Merge branch 'jn/apply-filename-with-sp'
2010-09-03 Merge branch 'jn/merge-custom-no-trivial'
2010-09-03 Merge branch 'jc/maint-doc-em-dash'
2010-09-03 Merge branch 'mg/doc-bundle'
2010-09-03 Merge branch 'jn/doc-backslash'
2010-09-03 Merge branch 'jn/update-contrib-example-merge'
2010-09-03 Merge branch 'jn/merge-renormalize'
2010-09-03 Sync with 1.7.2.3
2010-09-01 Merge branch 'maint'
2010-08-31 Merge branch 'np/maint-huge-delta-generation'
2010-08-31 Merge branch 'da/fix-submodule-sync-superproject-config'
2010-08-31 Merge branch 'jn/cherry-revert-message-clean-up'
2010-08-31 Merge branch 'cb/binary-patch-id'
2010-08-31 Merge branch 'ab/maint-reset-mixed-w-pathspec-advice'
2010-08-31 Merge branch 'dj/fetch-tagopt'
2010-08-31 Merge branch 'en/d-f-conflict-fix'
2010-08-31 Merge branch 'jn/svn-fe'
2010-08-31 Merge branch 'tr/maint-no-unquote-plus'
2010-08-31 Merge branch 'jn/maint-setup-fix'
2010-08-16 Merge branch 'jn/maint-setup-fix' (early part) into...
2010-08-04 setup: do not forget working dir from subdir of gitdir
2010-08-04 t4111 (apply): refresh index before applying patches...
2010-07-26 tests: try git apply from subdir of toplevel