git.oblomov.eu Git - git/history - t/t5536-fetch-conflicts.sh

2018-03-21	Junio C Hamano	Merge branch 'js/ming-strftime'	blob \| commitdiff \| raw
2018-03-21	Junio C Hamano	Merge branch 'dp/merge-strategy-doc-fix'	blob \| commitdiff \| raw
2018-03-21	Junio C Hamano	Merge branch 'rj/http-code-cleanup'	blob \| commitdiff \| raw
2018-03-21	Junio C Hamano	Merge branch 'ks/t3200-typofix'	blob \| commitdiff \| raw
2018-03-21	Junio C Hamano	Merge branch 'bp/refresh-cache-ent-rehash-fix'	blob \| commitdiff \| raw
2018-03-21	Junio C Hamano	Merge branch 'jh/fsck-promisors'	blob \| commitdiff \| raw
2018-03-21	Junio C Hamano	Merge branch 'ma/skip-writing-unchanged-index'	blob \| commitdiff \| raw
2018-03-21	Junio C Hamano	Merge branch 'ma/config-page-only-in-list-mode'	blob \| commitdiff \| raw
2018-03-21	Jiang Xin	Merge branch 'master' of https://github.com/Softcatala...	blob \| commitdiff \| raw
2018-03-15	Jiang Xin	Merge remote-tracking branch 'git-po/maint'	blob \| commitdiff \| raw
2018-03-15	Junio C Hamano	Merge branch 'tl/userdiff-csharp-async'	blob \| commitdiff \| raw
2018-03-15	Junio C Hamano	Merge branch 'sg/cvs-tests-with-x'	blob \| commitdiff \| raw
2018-03-15	Junio C Hamano	Merge branch 'ab/man-sec-list'	blob \| commitdiff \| raw
2018-03-15	Junio C Hamano	Merge branch 'ab/perl-fixes'	blob \| commitdiff \| raw
2018-03-15	Junio C Hamano	Merge branch 'cl/send-email-reply-to'	blob \| commitdiff \| raw
2018-03-15	Junio C Hamano	Merge branch 'np/send-email-header-parsing'	blob \| commitdiff \| raw
2018-03-14	Junio C Hamano	Merge branch 'nd/parseopt-completion'	blob \| commitdiff \| raw
2018-03-14	Junio C Hamano	Merge branch 'nd/object-allocation-comments'	blob \| commitdiff \| raw
2018-03-14	Junio C Hamano	Merge branch 'jk/smart-http-protocol-doc-fix'	blob \| commitdiff \| raw
2018-03-14	Junio C Hamano	Merge branch 'jk/add-i-diff-filter'	blob \| commitdiff \| raw
2018-03-14	Junio C Hamano	Merge branch 'nd/worktree-move'	blob \| commitdiff \| raw
2018-03-14	Junio C Hamano	Merge branch 'pw/add-p-recount'	blob \| commitdiff \| raw
2018-03-14	Junio C Hamano	Merge branch 'ab/pre-auto-gc-battery'	blob \| commitdiff \| raw
2018-03-14	Junio C Hamano	Merge branch 'sg/test-x'	blob \| commitdiff \| raw
2018-03-14	Junio C Hamano	Merge branch 'rj/test-i18ngrep'	blob \| commitdiff \| raw
2018-03-14	Junio C Hamano	Merge branch 'nd/diff-stat-with-summary'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'ab/gc-auto-in-commit'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'bp/untracked-cache-noflush'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'mk/doc-pretty-fill'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'jc/test-must-be-empty'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'ds/mark-parents-uninteresting-optim'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'ds/find-unique-abbrev-optim'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'sg/subtree-signed-commits'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'rv/grep-cleanup'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'ot/ref-filter-cleanup'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'jh/status-no-ahead-behind'	blob \| commitdiff \| raw \| diff to current
2018-03-08	Junio C Hamano	Merge branch 'sg/travis-build-during-script-phase'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'bw/perl-timegm-timelocal-fix'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'jk/strbuf-read-file-close-error'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'bw/c-plus-plus'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'rs/strbuf-read-file-or-whine'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'ms/non-ascii-ticks'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'jk/cached-commit-buffer'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'bw/doc-submodule-recurse-config-with...	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'jc/allow-ff-merging-kept-tags'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'ab/simplify-perl-makefile'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'pw/add-p-single'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'sg/t6300-modernize'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'sb/color-h-cleanup'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'nd/rebase-show-current-patch'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'xz/send-email-batch-size'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'ab/fetch-prune'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'sm/mv-dry-run-update'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'nm/tag-edit'	blob \| commitdiff \| raw \| diff to current
2018-03-06	Junio C Hamano	Merge branch 'cb/ttk-style' of git-gui into cb/git...	blob \| commitdiff \| raw \| diff to current
2018-03-02	Junio C Hamano	Merge branch 'bb/ssh-key-files' of git-gui into bb...	blob \| commitdiff \| raw \| diff to current
2018-03-02	Junio C Hamano	Merge branch 'bp/bind-kp-enter' of git-gui into bp...	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'jk/push-options-via-transport-fix'	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'tz/do-not-clean-spec-file'	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'tg/worktree-create-tracking'	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'gs/test-unset-xdg-cache-home'	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'tk/apply-dev-null-verify-name-fix'	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'sb/status-doc-fix'	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'es/worktree-add-post-checkout-hook'	blob \| commitdiff \| raw \| diff to current
2018-02-28	Junio C Hamano	Merge branch 'nd/am-quit'	blob \| commitdiff \| raw \| diff to current
2018-02-28	SZEDER Gábor	t5536: simplify checking of messages output to stderr	blob \| commitdiff \| raw
2018-02-27	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'jt/binsearch-with-fanout'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'rd/typofix'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'jk/test-hashmap-updates'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'jk/sq-dequote-on-bogus-input'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'bp/fsmonitor'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'bc/doc-interpret-trailers-grammofix'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'as/ll-i18n'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'sg/doc-test-must-fail-args'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'sb/describe-blob'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'rs/check-ignore-multi'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'rj/sparse-updates'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'jk/t0002-simplify'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'js/packet-read-line-check-null'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'js/fix-merge-arg-quoting-in-rebase-p'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'jk/gettext-poison'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'jk/doc-do-not-write-extern'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'bp/name-hash-dirname-fix'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'jc/blame-missing-path'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'ab/untracked-cache-invalidation-docs'	blob \| commitdiff \| raw \| diff to current
2018-02-27	Junio C Hamano	Merge branch 'nd/fix-untracked-cache-invalidation'	blob \| commitdiff \| raw \| diff to current
2018-02-21	Junio C Hamano	Merge branch 'sg/test-i18ngrep'	blob \| commitdiff \| raw \| diff to current
2018-02-08	SZEDER Gábor	t5536: let 'test_i18ngrep' read the file without redire...	blob \| commitdiff \| raw \| diff to current
2018-01-09	Junio C Hamano	Merge branch 'js/misc-git-gui-stuff' of ../git-gui	blob \| commitdiff \| raw \| diff to current
2017-12-27	Junio C Hamano	Merge branch 'es/clone-shared-worktree'	blob \| commitdiff \| raw \| diff to current
2017-12-27	Junio C Hamano	Merge branch 'jk/cvsimport-quoting'	blob \| commitdiff \| raw \| diff to current
2017-12-27	Junio C Hamano	Merge branch 'rs/am-builtin-leakfix'	blob \| commitdiff \| raw \| diff to current
2017-12-05	Junio C Hamano	Merge branch 'ls/no-double-utf8-author-name' of .....	blob \| commitdiff \| raw \| diff to current
2017-11-22	Junio C Hamano	Merge branch 'jn/reproducible-build' of ../git-gui...	blob \| commitdiff \| raw \| diff to current
2017-11-09	Junio C Hamano	Merge branch 'tz/fsf-address-update' of ../git-gui...	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'ex/deprecate-empty-pathspec-as-match...	blob \| commitdiff \| raw \| diff to current
2017-10-28	Junio C Hamano	Merge branch 'sg/rev-list-doc-reorder-fix'	blob \| commitdiff \| raw \| diff to current
2017-10-23	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update' into maint	blob \| commitdiff \| raw \| diff to current
2017-10-19	Junio C Hamano	Merge branch 'jc/fetch-refspec-doc-update'	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom