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

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

2014-04-02	Merge branch 'ap/remote-hg-skip-null-bookmarks'	blob \| diff \| raw
2014-03-31	Merge branch 'mm/status-porcelain-format-i18n-fix'	blob \| diff \| raw
2014-03-31	Merge branch 'wt/doc-submodule-name-path-confusion-2'	blob \| diff \| raw
2014-03-31	Merge branch 'wt/doc-submodule-name-path-confusion-1'	blob \| diff \| raw
2014-03-31	Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'	blob \| diff \| raw
2014-03-31	Merge branch 'ca/doc-config-third-party'	blob \| diff \| raw
2014-03-31	Merge branch 'hs/simplify-bit-setting-in-fsck-tree'	blob \| diff \| raw
2014-03-28	Merge branch 'jk/pack-bitmap'	blob \| diff \| raw
2014-03-25	Merge branch 'rr/doc-merge-strategies'	blob \| diff \| raw
2014-03-25	Merge branch 'nd/index-pack-error-message'	blob \| diff \| raw
2014-03-25	Merge branch 'jk/lib-terminal-lazy'	blob \| diff \| raw
2014-03-25	Merge branch 'dm/configure-iconv-locale-charset'	blob \| diff \| raw
2014-03-25	Merge branch 'jk/warn-on-object-refname-ambiguity'	blob \| diff \| raw
2014-03-25	Merge branch 'mh/remove-subtree-long-pathname-fix'	blob \| diff \| raw
2014-03-25	Merge branch 'nd/indent-fix-connect-c'	blob \| diff \| raw
2014-03-25	Merge branch 'jk/mv-submodules-fix'	blob \| diff \| raw
2014-03-25	Merge branch 'cp/am-patch-format-doc'	blob \| diff \| raw
2014-03-21	Merge branch 'es/sh-i18n-envsubst'	blob \| diff \| raw
2014-03-21	Merge branch 'jc/stash-pop-not-popped'	blob \| diff \| raw
2014-03-18	Merge branch 'jk/clean-d-pathspec' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'da/difftool-git-files' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'jk/remote-pushremote-config-reading'...	blob \| diff \| raw
2014-03-18	Merge branch 'jk/commit-dates-parsing-fix' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'tr/diff-submodule-no-reuse-worktree'...	blob \| diff \| raw
2014-03-18	Merge branch 'nd/reset-setup-worktree' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'jc/check-attr-honor-working-tree' into...	blob \| diff \| raw
2014-03-18	Merge branch 'bk/refresh-missing-ok-in-merge-recursive...	blob \| diff \| raw
2014-03-18	Merge branch 'ds/rev-parse-required-args' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'jk/config-path-include-fix' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'nd/diff-quiet-stat-dirty' into maint	blob \| diff \| raw
2014-03-18	Merge branch 'jc/no-need-for-env-in-sh-scripts'	blob \| diff \| raw
2014-03-18	Merge branch 'mh/simplify-cache-tree-find'	blob \| diff \| raw
2014-03-18	Merge branch 'jn/branch-lift-unnecessary-name-length...	blob \| diff \| raw
2014-03-18	Merge branch 'jk/repack-pack-keep-objects'	blob \| diff \| raw
2014-03-18	Merge branch 'fc/transport-helper-fixes'	blob \| diff \| raw
2014-03-18	Merge branch 'nd/sha1-file-delta-stack-leakage-fix'	blob \| diff \| raw
2014-03-18	Merge branch 'jk/diff-filespec-cleanup'	blob \| diff \| raw
2014-03-18	Merge branch 'jk/clean-d-pathspec'	blob \| diff \| raw
2014-03-14	Merge branch 'sr/add--interactive-term-readkey'	blob \| diff \| raw
2014-03-14	Merge branch 'sh/write-pack-file-warning-message-fix'	blob \| diff \| raw
2014-03-14	Merge branch 'jn/bisect-coding-style'	blob \| diff \| raw
2014-03-14	Merge branch 'rt/help-pretty-prints-cmd-names'	blob \| diff \| raw
2014-03-14	Merge branch 'jl/doc-submodule-update-checkout'	blob \| diff \| raw
2014-03-14	Merge branch 'jk/doc-coding-guideline'	blob \| diff \| raw
2014-03-14	Merge branch 'da/difftool-git-files'	blob \| diff \| raw
2014-03-14	Merge branch 'jm/stash-doc-k-for-keep'	blob \| diff \| raw
2014-03-14	Merge branch 'jk/remote-pushremote-config-reading'	blob \| diff \| raw
2014-03-14	Merge branch 'jk/commit-dates-parsing-fix'	blob \| diff \| raw
2014-03-14	Merge branch 'jh/note-trees-record-blobs'	blob \| diff \| raw
2014-03-14	Merge branch 'tr/diff-submodule-no-reuse-worktree'	blob \| diff \| raw
2014-03-14	Merge branch 'nd/reset-setup-worktree'	blob \| diff \| raw
2014-03-14	Merge branch 'nd/gitignore-trailing-whitespace'	blob \| diff \| raw
2014-03-14	Merge branch 'jc/check-attr-honor-working-tree'	blob \| diff \| raw
2014-03-07	Merge branch 'cc/starts-n-ends-with-endgame'	blob \| diff \| raw
2014-03-07	Merge branch 'jc/hold-diff-remove-q-synonym-for-no...	blob \| diff \| raw
2014-03-07	Merge branch 'gj/push-more-verbose-advice'	blob \| diff \| raw
2014-03-07	Merge branch 'jc/core-checkstat-2.0'	blob \| diff \| raw
2014-03-07	Merge branch 'jc/add-2.0-ignore-removal'	blob \| diff \| raw
2014-03-07	Merge branch 'jn/add-2.0-u-A-sans-pathspec'	blob \| diff \| raw
2014-03-07	Merge branch 'jc/push-2.0-default-to-simple'	blob \| diff \| raw
2014-03-03	Merge branch 'sh/write-pack-file-warning-message-fix...	blob \| diff \| raw
2014-02-27	Merge branch 'jk/pack-bitmap'	blob \| diff \| raw
2014-02-27	Merge branch 'mw/symlinks'	blob \| diff \| raw
2014-02-27	Merge branch 'nd/test-rename-reset'	blob \| diff \| raw
2014-02-27	Merge branch 'wk/submodule-on-branch'	blob \| diff \| raw
2014-02-27	Merge branch 'ep/varscope'	blob \| diff \| raw
2014-02-27	Merge branch 'bs/stdio-undef-before-redef'	blob \| diff \| raw
2014-02-27	Merge branch 'jk/config-path-include-fix'	blob \| diff \| raw
2014-02-27	Merge branch 'ds/rev-parse-required-args'	blob \| diff \| raw
2014-02-27	Merge branch 'nd/diff-quiet-stat-dirty'	blob \| diff \| raw
2014-02-27	Merge branch 'bk/refresh-missing-ok-in-merge-recursive'	blob \| diff \| raw
2014-02-27	Merge branch 'da/pull-ff-configuration'	blob \| diff \| raw
2014-02-27	Merge branch 'kb/fast-hashmap'	blob \| diff \| raw
2014-02-27	Merge branch 'nv/commit-gpgsign-config'	blob \| diff \| raw
2014-02-13	Sync with 1.8.5.5	blob \| diff \| raw
2014-02-07	Merge branch 'ow/manpages-typofix'	blob \| diff \| raw
2014-02-07	Merge branch 'aj/ada-diff-word-pattern'	blob \| diff \| raw
2014-02-07	Merge branch 'nd/tag-doc'	blob \| diff \| raw
2014-02-05	Sync with 1.8.5.4	blob \| diff \| raw
2014-02-05	Merge branch 'tb/repack-fix-renames' (early part)	blob \| diff \| raw
2014-01-31	Merge branch 'jn/pager-lv-default-env'	blob \| diff \| raw
2014-01-27	Merge branch 'as/tree-walk-fix-aggressive-short-cut'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/revision-o-is-in-libgit-a'	blob \| diff \| raw
2014-01-27	Merge branch 'sb/repack-in-c'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/test-fixes'	blob \| diff \| raw
2014-01-27	Merge branch 'nd/negative-pathspec'	blob \| diff \| raw
2014-01-27	Merge branch 'ss/safe-create-leading-dir-with-slash'	blob \| diff \| raw
2014-01-27	Merge branch 'mh/safe-create-leading-directories'	blob \| diff \| raw
2014-01-27	Merge branch 'tr/nth-previous-is-a-commit'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/mark-edges-uninteresting'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/diff-filespec-cleanup'	blob \| diff \| raw
2014-01-27	Merge branch 'ef/mingw-write'	blob \| diff \| raw
2014-01-27	Merge branch 'rk/send-email-ssl-cert'	blob \| diff \| raw
2014-01-27	Merge branch 'jn/ignore-doc'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/interpret-branch-name-fix'	blob \| diff \| raw
2014-01-27	Merge branch 'jk/allow-fetch-onelevel-refname'	blob \| diff \| raw
2014-01-27	Merge branch 'jc/revision-range-unpeel'	blob \| diff \| raw
2014-01-27	Merge branch 'mh/retire-ref-fetch-rules'	blob \| diff \| raw
2014-01-27	Merge branch 'mh/attr-macro-doc'	blob \| diff \| raw
2014-01-27	Merge branch 'jc/maint-pull-docfix'	blob \| diff \| raw
next