Merge branch 'sb/submodule-module-list-pathspec-fix'
[gitweb.git] / t / t4200-rerere.sh
2016-05-13 Merge branch 'sb/submodule-module-list-pathspec-fix'
2016-05-13 Merge branch 'jc/commit-tree-ignore-commit-gpgsign'
2016-05-10 Merge branch 'sk/gitweb-highlight-encoding'
2016-05-10 Merge branch 'sb/clean-test-fix'
2016-05-10 Merge branch 'rn/glossary-typofix'
2016-05-10 Merge branch 'ls/travis-submitting-patches'
2016-05-10 Merge branch 'js/close-packs-before-gc'
2016-05-10 Merge branch 'ew/normal-to-e'
2016-05-10 Merge branch 'ls/p4-lfs'
2016-05-10 Merge branch 'sb/misc-cleanups'
2016-05-10 Merge branch 'ew/doc-split-pack-disables-bitmap'
2016-05-06 Sync with maint
2016-05-06 Merge branch 'jk/diff-compact-heuristic'
2016-05-06 Merge branch 'ls/p4-lfs-test-fix-2.7.0'
2016-05-06 Merge branch 'bc/object-id'
2016-05-06 Merge branch 'bw/rebase-merge-entire-branch'
2016-05-06 Merge branch 'jc/drop-git-spec-in'
2016-05-06 Merge branch 'js/http-custom-headers'
2016-05-06 Merge branch 'sb/clone-shallow-passthru'
2016-05-06 Merge branch 'ld/p4-test-py3'
2016-05-06 Merge branch 'sb/config-exit-status-list'
2016-05-03 Sync with maint
2016-05-03 Merge branch 'nf/mergetool-prompt'
2016-05-03 Merge branch 'jd/send-email-to-whom'
2016-05-03 Merge branch 'rt/string-list-lookup-cleanup'
2016-05-03 Merge branch 'jk/fix-attribute-macro-in-2.5'
2016-05-03 Merge branch 'sg/test-lib-simplify-expr-away'
2016-05-03 Merge branch 'nd/remove-unused'
2016-05-03 Merge branch 'js/name-rev-use-oldest-ref'
2016-05-03 Merge branch 'jd/p4-jobs-in-commit'
2016-05-03 Merge branch 'en/merge-fixes'
2016-05-02 Sync with maint
2016-04-29 Sync with 2.8.2
2016-04-29 Merge branch 'st/verify-tag'
2016-04-29 Merge branch 'js/win32-mmap'
2016-04-29 Merge branch 'jc/merge-refuse-new-root'
2016-04-29 Merge branch 'jk/push-client-deadlock-fix'
2016-04-29 Merge branch 'js/replace-edit-use-editor-configuration'
2016-04-29 Merge branch 'sb/mv-submodule-fix'
2016-04-29 Merge branch 'nd/test-helpers'
2016-04-29 Merge branch 'da/user-useconfigonly'
2016-04-25 Sync with maint
2016-04-25 Merge branch 'sb/submodule-path-misc-bugs'
2016-04-25 Merge branch 'en/merge-trivial-fix'
2016-04-25 Merge branch 'en/merge-octopus-fix'
2016-04-25 Merge branch 'dt/pre-refs-backend'
2016-04-25 Merge branch 'jc/rerere-multi'
2016-04-06 rerere: adjust 'forget' to multi-variant world order
2016-04-06 rerere: gc and clear
2016-03-21 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-15 rerere: do use multiple variants
2016-03-15 t4200: rerere a merge with two identical conflicts
2016-03-15 rerere: handle leftover rr-cache/$ID directory and...
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-01 Merge branch 'mc/commit-doc-grammofix'
2015-05-26 Merge branch 'sg/complete-decorate-full-not-long' into...
2015-05-13 Merge branch 'ep/fix-test-lib-functions-report' into...
2015-05-11 Merge branch 'sg/complete-decorate-full-not-long'
2015-05-06 Merge branch 'ep/fix-test-lib-functions-report'
2015-04-28 Merge branch 'mg/show-notes-doc'
2015-04-21 Merge branch 'jz/gitweb-conf-doc-fix' into maint
2015-04-19 Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-04-14 Merge branch 'sb/plug-streaming-leak'
2015-04-14 Merge branch 'jz/gitweb-conf-doc-fix'
2015-03-24 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-05 Merge branch 'jk/pack-bitmap' into maint
2015-03-05 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25 Merge branch 'jc/max-io-size-and-ssize-max'
2015-02-25 Merge branch 'tc/missing-http-proxyauth'
2015-02-25 Merge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-25 Merge branch 'jk/status-read-branch-name-fix' into...
2015-02-18 Merge branch 'jk/pack-bitmap'
2015-02-17 Merge branch 'jk/status-read-branch-name-fix'
next