Andrew's git - gitweb.git/history - t/t5536-fetch-conflicts.sh

[gitweb.git] / t / t5536-fetch-conflicts.sh

2014-01-13	Merge branch 'jk/t5531-prepare-to-default-to-non-matching'	blob \| diff \| raw
2014-01-13	Merge branch 'mh/shorten-unambigous-ref'	blob \| diff \| raw
2014-01-13	Merge branch 'mm/mv-file-to-no-such-dir-with-slash'	blob \| diff \| raw
2014-01-13	Merge branch 'jk/pull-rebase-using-fork-point'	blob \| diff \| raw
2014-01-13	Merge branch 'ow/stash-with-ifs'	blob \| diff \| raw
2014-01-13	Merge branch 'jn/pager-lv-default-env'	blob \| diff \| raw
2014-01-13	Merge branch 'br/sha1-name-40-hex-no-disambiguation'	blob \| diff \| raw
2014-01-10	Merge branch 'ta/format-user-manual-as-an-article'	blob \| diff \| raw
2014-01-10	Merge branch 'js/lift-parent-count-limit'	blob \| diff \| raw
2014-01-10	Merge branch 'jk/test-framework-updates'	blob \| diff \| raw
2014-01-10	Merge branch 'bm/merge-base-octopus-dedup'	blob \| diff \| raw
2014-01-10	Merge branch 'km/gc-eperm'	blob \| diff \| raw
2014-01-10	Merge branch 'jk/http-auth-tests-robustify'	blob \| diff \| raw
2014-01-10	Merge branch 'jk/credential-plug-leak'	blob \| diff \| raw
2014-01-10	Merge branch 'bs/mirbsd'	blob \| diff \| raw
2014-01-10	Merge branch 'nd/commit-tree-constness'	blob \| diff \| raw
2014-01-10	Merge branch 'nd/add-empty-fix'	blob \| diff \| raw
2014-01-10	Merge branch 'nd/daemon-informative-errors-typofix'	blob \| diff \| raw
2014-01-10	Merge branch 'bc/log-decoration'	blob \| diff \| raw
2014-01-10	Merge branch 'jh/rlimit-nofile-fallback'	blob \| diff \| raw
2014-01-10	Merge branch 'rt/bfg-ad-in-filter-branch-doc'	blob \| diff \| raw
2014-01-10	Merge branch 'cc/replace-object-info'	blob \| diff \| raw
2014-01-10	Merge branch 'nd/negative-pathspec'	blob \| diff \| raw
2014-01-06	Merge branch 'maint'	blob \| diff \| raw
2013-12-30	Merge branch 'maint'	blob \| diff \| raw
2013-12-27	Merge branch 'fc/remote-helper-fixes'	blob \| diff \| raw
2013-12-27	Merge branch 'js/gnome-keyring'	blob \| diff \| raw
2013-12-27	Merge branch 'jk/name-pack-after-byte-representation'	blob \| diff \| raw
2013-12-27	Merge branch 'tg/diff-no-index-refactor'	blob \| diff \| raw
2013-12-27	Merge branch 'zk/difftool-counts'	blob \| diff \| raw
2013-12-27	Merge branch 'jk/cat-file-regression-fix'	blob \| diff \| raw
2013-12-27	Merge branch 'jk/pull-rebase-using-fork-point'	blob \| diff \| raw
2013-12-27	Merge branch 'jk/rev-parse-double-dashes'	blob \| diff \| raw
2013-12-27	Merge branch 'jc/push-refmap'	blob \| diff \| raw
2013-12-17	Sync with 1.8.5.2	blob \| diff \| raw
2013-12-17	Merge branch 'kn/gitweb-extra-branch-refs'	blob \| diff \| raw
2013-12-17	Merge branch 'tb/clone-ssh-with-colon-for-port'	blob \| diff \| raw
2013-12-17	Merge branch 'nd/transport-positive-depth-only'	blob \| diff \| raw
2013-12-17	Merge branch 'cc/starts-n-ends-with'	blob \| diff \| raw
2013-12-17	Merge branch 'jl/commit-v-strip-marker'	blob \| diff \| raw
2013-12-17	Merge branch 'tr/send-email-ssl'	blob \| diff \| raw
2013-12-17	Merge branch 'nd/gettext-vsnprintf'	blob \| diff \| raw
2013-12-17	Merge branch 'mm/mv-file-to-no-such-dir-with-slash'	blob \| diff \| raw
2013-12-17	Merge branch 'nd/remove-opt-boolean'	blob \| diff \| raw
2013-12-17	Merge branch 'bc/doc-merge-no-op-revert'	blob \| diff \| raw
2013-12-17	Merge branch 'fc/trivial'	blob \| diff \| raw
2013-12-17	Merge branch 'jk/t5000-gzip-simplify'	blob \| diff \| raw
2013-12-17	Merge branch 'kb/doc-exclude-directory-semantics'	blob \| diff \| raw
2013-12-12	Merge branch 'jn/scripts-updates'	blob \| diff \| raw
2013-12-12	Merge branch 'cn/thin-push-capability'	blob \| diff \| raw
2013-12-12	Merge branch 'jk/remove-deprecated'	blob \| diff \| raw
2013-12-12	Merge branch 'tr/commit-slab-cleanup'	blob \| diff \| raw
2013-12-12	Merge branch 'rs/doc-submitting-patches'	blob \| diff \| raw
2013-12-12	Merge branch 'tr/doc-git-cherry'	blob \| diff \| raw
2013-12-12	Merge branch 'cl/p4-use-diff-tree'	blob \| diff \| raw
2013-12-12	Merge branch 'tr/config-multivalue-lift-max'	blob \| diff \| raw
2013-12-12	Merge branch 'mh/fetch-tags-in-addition-to-normal-refs'	blob \| diff \| raw
2013-10-30	fetch: improve the error messages emitted for conflicti...	blob \| diff \| raw
2013-10-30	t5536: new test of refspec conflicts when fetching	blob \| diff \| raw \| diff to current