Merge branch 'jk/oi-delta-base'
[gitweb.git] / t / t5536-fetch-conflicts.sh
2014-01-10 Merge branch 'nd/add-empty-fix'
2014-01-10 Merge branch 'nd/daemon-informative-errors-typofix'
2014-01-10 Merge branch 'bc/log-decoration'
2014-01-10 Merge branch 'jh/rlimit-nofile-fallback'
2014-01-10 Merge branch 'rt/bfg-ad-in-filter-branch-doc'
2014-01-10 Merge branch 'cc/replace-object-info'
2014-01-10 Merge branch 'nd/negative-pathspec'
2014-01-06 Merge branch 'maint'
2013-12-30 Merge branch 'maint'
2013-12-27 Merge branch 'fc/remote-helper-fixes'
2013-12-27 Merge branch 'js/gnome-keyring'
2013-12-27 Merge branch 'jk/name-pack-after-byte-representation'
2013-12-27 Merge branch 'tg/diff-no-index-refactor'
2013-12-27 Merge branch 'zk/difftool-counts'
2013-12-27 Merge branch 'jk/cat-file-regression-fix'
2013-12-27 Merge branch 'jk/pull-rebase-using-fork-point'
2013-12-27 Merge branch 'jk/rev-parse-double-dashes'
2013-12-27 Merge branch 'jc/push-refmap'
2013-12-17 Sync with 1.8.5.2
2013-12-17 Merge branch 'kn/gitweb-extra-branch-refs'
2013-12-17 Merge branch 'tb/clone-ssh-with-colon-for-port'
2013-12-17 Merge branch 'nd/transport-positive-depth-only'
2013-12-17 Merge branch 'cc/starts-n-ends-with'
2013-12-17 Merge branch 'jl/commit-v-strip-marker'
2013-12-17 Merge branch 'tr/send-email-ssl'
2013-12-17 Merge branch 'nd/gettext-vsnprintf'
2013-12-17 Merge branch 'mm/mv-file-to-no-such-dir-with-slash'
2013-12-17 Merge branch 'nd/remove-opt-boolean'
2013-12-17 Merge branch 'bc/doc-merge-no-op-revert'
2013-12-17 Merge branch 'fc/trivial'
2013-12-17 Merge branch 'jk/t5000-gzip-simplify'
2013-12-17 Merge branch 'kb/doc-exclude-directory-semantics'
2013-12-12 Merge branch 'jn/scripts-updates'
2013-12-12 Merge branch 'cn/thin-push-capability'
2013-12-12 Merge branch 'jk/remove-deprecated'
2013-12-12 Merge branch 'tr/commit-slab-cleanup'
2013-12-12 Merge branch 'rs/doc-submitting-patches'
2013-12-12 Merge branch 'tr/doc-git-cherry'
2013-12-12 Merge branch 'cl/p4-use-diff-tree'
2013-12-12 Merge branch 'tr/config-multivalue-lift-max'
2013-12-12 Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'
2013-10-30 fetch: improve the error messages emitted for conflicti...
2013-10-30 t5536: new test of refspec conflicts when fetching