Merge branch 'sb/push-options'
[gitweb.git] / t / t5536-fetch-conflicts.sh
2016-08-03 Merge branch 'sb/push-options'
2016-08-03 Merge branch 'ew/http-walker'
2016-08-03 Merge branch 'pm/build-persistent-https-with-recent-go'
2016-08-03 Merge branch 'da/subtree-2.9-regression'
2016-08-03 Merge branch 'os/no-verify-skips-commit-msg-too'
2016-07-28 Sync with maint
2016-07-28 Merge branch 'js/t3404-grammo-fix' into maint
2016-07-28 Merge branch 'sb/submodule-deinit-all'
2016-07-28 Merge branch 'ew/find-perl-on-freebsd-in-local'
2016-07-28 Merge branch 'ew/daemon-socket-keepalive'
2016-07-28 Merge branch 'nd/pack-ofs-4gb-limit'
2016-07-28 Merge branch 'nd/worktree-lock'
2016-07-28 Merge branch 'rs/notes-merge-no-toctou'
2016-07-28 Merge branch 'js/rebase-i-tests'
2016-07-25 Merge branch 'rs/use-strbuf-addbuf'
2016-07-25 Merge branch 'ew/autoconf-pthread'
2016-07-25 Merge branch 'mh/blame-worktree'
2016-07-25 Merge branch 'nd/cache-tree-ita'
2016-07-25 Merge branch 'jk/push-scrub-url'
2016-07-25 Merge branch 'nd/test-helpers'
2016-07-25 Merge branch 'jc/doc-diff-filter-exclude'
2016-07-25 Merge branch 'ls/travis-enable-httpd-tests'
2016-07-25 Merge branch 'jc/renormalize-merge-kill-safer-crlf'
2016-07-25 Merge branch 'rs/worktree-use-strbuf-absolute-path'
2016-07-25 Merge branch 'rs/rm-strbuf-optim'
2016-07-25 Merge branch 'rw/make-needs-librt'
2016-07-25 Merge branch 'js/ignore-space-at-eol'
2016-07-25 Merge branch 'mh/ref-iterators'
2016-07-25 Merge branch 'mh/update-ref-errors'
2016-07-25 Merge branch 'mh/split-under-lock'
2016-07-19 Merge branch 'ls/p4-tmp-refs'
2016-07-19 Merge branch 'js/am-call-theirs-theirs-in-fallback...
2016-07-19 Merge branch 'jk/write-file'
2016-07-19 Merge branch 'jk/printf-format'
2016-07-19 Merge branch 'rs/help-c-source-with-gitattributes'
2016-07-19 Merge branch 'nd/fetch-ref-summary'
2016-07-19 Merge branch 'jk/test-match-signal'
2016-07-19 Merge branch 'jk/common-main'
2016-07-19 Merge branch 'ak/lazy-prereq-mktemp'
2016-07-19 Merge branch 'nd/icase'
2016-07-19 Merge branch 'bc/cocci'
2016-07-19 Merge branch 'js/log-to-diffopt-file'
2016-07-19 Merge branch 'sb/submodule-parallel-fetch'
2016-07-19 Merge branch 'lf/recv-sideband-cleanup'
2016-07-19 Merge branch 'dk/blame-move-no-reason-for-1-line-context'
2016-07-19 Merge branch 'nd/connect-ssh-command-config'
2016-07-15 Sync with 2.9.2
2016-07-14 Merge branch 'jk/upload-pack-hook'
2016-07-13 Merge branch 'jk/big-and-future-archive-tar'
2016-07-13 Merge branch 'nd/ita-cleanup'
2016-07-13 Merge branch 'ps/rebase-i-auto-unstash-upon-abort'
2016-07-13 Merge branch 'js/t3404-grammo-fix'
2016-07-13 Merge branch 'js/sign-empty-commit-fix'
2016-07-13 Merge branch 'mm/doc-tt'
2016-07-13 Merge branch 'dg/subtree-rebase-test'
2016-07-13 Merge branch 'nd/doc-new-command'
2016-07-13 Merge branch 'ew/gc-auto-pack-limit-fix'
2016-07-13 Merge branch 'ah/unpack-trees-advice-messages'
2016-07-13 Merge branch 'va/i18n-even-more'
2016-07-11 Merge branch 'cb/t7810-test-label-fix' into maint
2016-07-06 Merge branch 'cb/t7810-test-label-fix'
2016-06-17 tests: use test_i18n* functions to suppress false positives
2016-05-26 Merge branch 'va/mailinfo-doc-typofix' into maint
2016-05-18 Merge branch 'rn/glossary-typofix' into HEAD
2016-05-17 Merge branch 'va/mailinfo-doc-typofix'
2016-05-10 Merge branch 'rn/glossary-typofix'
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-14 Merge branch 'mg/wt-status-mismarked-i18n'
2016-02-22 Merge branch 'jk/config-include'
2015-12-21 Merge git://ozlabs.org/~paulus/gitk
2015-11-05 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03 Merge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30 Merge git://ozlabs.org/~paulus/gitk
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-17 Merge branch 'as/config-doc-markup-fix'
2015-09-17 Merge branch 'br/svn-doc-include-paths-config' into...
2015-09-17 Merge branch 'ah/submodule-typofix-in-error' into maint
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-09-02 Merge branch 'ee/clean-test-fixes'
2015-09-01 Merge branch 'ah/submodule-typofix-in-error'
2015-09-01 Merge branch 'ah/reflog-typofix-in-error'
2015-09-01 Merge branch 'ah/read-tree-usage-string'
2015-09-01 Merge branch 'ah/pack-objects-usage-strings'
2015-09-01 Merge branch 'br/svn-doc-include-paths-config'
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-07-15 Merge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15 Merge branch 'fk/doc-format-patch-vn' into maint
2015-07-01 Merge branch 'jc/prompt-document-ps1-state-separator'
2015-06-24 Merge branch 'fk/doc-format-patch-vn'
2015-06-16 Merge branch 'mc/commit-doc-grammofix' into maint
2015-06-05 Merge branch 'jc/gitignore-precedence' into maint
2015-06-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-19 Merge branch 'jc/gitignore-precedence'
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into...
next