merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir
[gitweb.git] / t / t3400-rebase.sh
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-06 Merge branch 'xx/trivial' into maint
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 '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-09-01 Merge branch 'gp/pack-refs-remove-empty-dirs' into...
2010-09-01 Merge branch 'sg/rerere-gc-old-still-used' into maint
2010-09-01 Merge branch 'dj/fetch-tagopt' into maint
2010-09-01 Merge branch 'da/fix-submodule-sync-superproject-config...
2010-09-01 Merge branch 'en/rebase-against-rebase-fix' into 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/paginate-fix'
2010-08-31 Merge branch 'jn/maint-setup-fix'
2010-08-31 Merge branch 'en/fast-export-fix'
2010-08-31 Merge branch 'hv/autosquash-config'
2010-08-31 Merge branch 'sg/rerere-gc-old-still-used'
2010-08-30 Merge branch 'maint'
2010-08-30 Merge branch 'maint-1.7.1' into maint
2010-08-26 Merge branch 'maint'
2010-08-24 Merge branch 'maint'
2010-08-23 Merge branch 'maint'
2010-08-22 Merge branch 'mm/rebase-i-exec'
2010-08-22 Merge branch 'gb/split-cmdline-errmsg'
2010-08-22 Merge branch 'so/http-user-agent'
2010-08-22 Merge branch 'mm/shortopt-detached'
2010-08-22 Merge branch 'sr/local-config'
2010-08-22 Merge branch 'nd/fix-sparse-checkout'
2010-08-22 Merge branch 'hv/submodule-find-ff-merge'
2010-08-22 Merge branch 'en/rebase-against-rebase-fix'
2010-08-22 Merge branch 'dg/local-mod-error-messages'
2010-08-22 Merge branch 'po/userdiff-csharp'
2010-08-22 Merge branch 'ab/perl-install'
2010-08-20 Merge branch 'jc/maint-follow-rename-fix' into maint
2010-08-20 Merge branch 'jn/maint-plug-leak' into maint
2010-08-20 Merge branch 'jn/fix-abbrev' into maint
2010-08-20 Merge branch 'vs/doc-spell' into maint
2010-08-20 Merge branch 'jn/rebase-rename-am' into maint
2010-08-19 Merge branch 'maint' to sync with 1.7.2.2
2010-08-19 Merge branch 'tr/xsize-bits' into maint
2010-08-19 Merge branch 'jc/sha1-name-find-fix' into maint
2010-08-18 Merge branch 'sp/fix-smart-http-deadlock-on-error'...
2010-08-18 Merge branch 'jc/maint-follow-rename-fix'
2010-08-18 Merge branch 'tf/string-list-init'
2010-08-18 Merge branch 'cc/find-commit-subject'
2010-08-18 Merge branch 'jn/maint-plug-leak'
2010-08-18 Merge branch 'jl/submodule-ignore-diff'
2010-08-18 Merge branch 'ml/rebase-x-strategy'
2010-08-18 Merge branch 'jn/fix-abbrev'
2010-08-18 Merge branch 'vs/doc-spell'
2010-08-18 Merge branch 'jh/use-test-must-fail'
2010-08-18 Merge branch 'jh/clean-exclude'
2010-08-18 Merge branch 'kf/post-receive-sample-hook'
2010-08-18 Merge branch 'ab/report-corrupt-object-with-type'
2010-08-18 Merge branch 'jn/rebase-rename-am'
2010-08-18 Merge branch 'tr/xsize-bits'
2010-08-18 Merge branch 'tc/checkout-B'
2010-08-13 Merge branch 'jc/sha1-name-find-fix'
2010-08-13 Merge branch 'sp/fix-smart-http-deadlock-on-error'
2010-08-11 unpack_trees: group error messages by type
2010-08-03 Merge branch 'sv/maint-diff-q-clear-fix' into maint
2010-08-02 Merge branch 'ab/tap' into maint
2010-08-02 Merge git://repo.or.cz/git-gui into pt/git-gui
2010-07-27 Sync with 1.7.1.2
2010-07-27 Sync with 1.7.0 series
2010-07-26 Merge branch 'maint-1.7.1' into maint
2010-07-26 Merge branch 'maint-1.7.0' into maint-1.7.1
2010-07-26 Merge branch 'maint-1.6.6' into maint-1.7.0
2010-07-26 Merge branch 'maint-1.6.4' into maint-1.6.5
2010-07-23 rebase: protect against diff.renames configuration
2010-07-23 t3400 (rebase): whitespace cleanup
2010-07-20 Merge branch 'maint'
next