Merge branch 'jc/ll-merge-internal'
[git] / t / t4200-rerere.sh
2016-05-17  Junio C HamanoMerge branch 'jc/ll-merge-internal'
2016-05-17  Junio C HamanoMerge branch 'jc/linkgit-fix'
2016-05-17  Junio C HamanoMerge branch 'va/i18n-remote-comment-to-align'
2016-05-17  Junio C HamanoMerge branch 'tb/t5601-sed-fix'
2016-05-17  Junio C HamanoMerge branch 'nd/error-errno'
2016-05-17  Junio C HamanoMerge branch 'jc/test-seq'
2016-05-17  Junio C HamanoMerge branch 'es/test-gpg-tags'
2016-05-17  Junio C HamanoMerge branch 'ak/t4151-ls-files-could-be-empty'
2016-05-17  Junio C HamanoMerge branch 'jk/submodule-c-credential'
2016-05-17  Junio C HamanoMerge branch 'nd/remote-plural-ours-plus-theirs'
2016-05-17  Junio C HamanoMerge branch 'bn/config-doc-tt-varnames'
2016-05-17  Junio C HamanoMerge branch 'va/i18n-misc-updates'
2016-05-17  Junio C HamanoMerge branch 'sb/z-is-gnutar-ism'
2016-05-17  Junio C HamanoMerge branch 'lp/typofixes'
2016-05-17  Junio C HamanoMerge branch 'sb/submodule-deinit-all'
2016-05-17  Junio C HamanoMerge branch 'jc/config-pathname-type'
2016-05-17  Junio C HamanoMerge branch 'bn/http-cookiefile-config'
2016-05-17  Junio C HamanoMerge branch 'ab/hooks'
2016-05-17  Junio C HamanoMerge branch 'sb/submodule-init'
2016-05-13  Junio C HamanoMerge branch 'sb/submodule-module-list-pathspec-fix'
2016-05-13  Junio C HamanoMerge branch 'jc/commit-tree-ignore-commit-gpgsign'
2016-05-10  Junio C HamanoMerge branch 'sk/gitweb-highlight-encoding'
2016-05-10  Junio C HamanoMerge branch 'sb/clean-test-fix'
2016-05-10  Junio C HamanoMerge branch 'rn/glossary-typofix'
2016-05-10  Junio C HamanoMerge branch 'ls/travis-submitting-patches'
2016-05-10  Junio C HamanoMerge branch 'js/close-packs-before-gc'
2016-05-10  Junio C HamanoMerge branch 'ew/normal-to-e'
2016-05-10  Junio C HamanoMerge branch 'ls/p4-lfs'
2016-05-10  Junio C HamanoMerge branch 'sb/misc-cleanups'
2016-05-10  Junio C HamanoMerge branch 'ew/doc-split-pack-disables-bitmap'
2016-05-06  Junio C HamanoSync with maint
2016-05-06  Junio C HamanoMerge branch 'jk/diff-compact-heuristic'
2016-05-06  Junio C HamanoMerge branch 'ls/p4-lfs-test-fix-2.7.0'
2016-05-06  Junio C HamanoMerge branch 'bc/object-id'
2016-05-06  Junio C HamanoMerge branch 'bw/rebase-merge-entire-branch'
2016-05-06  Junio C HamanoMerge branch 'jc/drop-git-spec-in'
2016-05-06  Junio C HamanoMerge branch 'js/http-custom-headers'
2016-05-06  Junio C HamanoMerge branch 'sb/clone-shallow-passthru'
2016-05-06  Junio C HamanoMerge branch 'ld/p4-test-py3'
2016-05-06  Junio C HamanoMerge branch 'sb/config-exit-status-list'
2016-05-03  Junio C HamanoSync with maint
2016-05-03  Junio C HamanoMerge branch 'nf/mergetool-prompt'
2016-05-03  Junio C HamanoMerge branch 'jd/send-email-to-whom'
2016-05-03  Junio C HamanoMerge branch 'rt/string-list-lookup-cleanup'
2016-05-03  Junio C HamanoMerge branch 'jk/fix-attribute-macro-in-2.5'
2016-05-03  Junio C HamanoMerge branch 'sg/test-lib-simplify-expr-away'
2016-05-03  Junio C HamanoMerge branch 'nd/remove-unused'
2016-05-03  Junio C HamanoMerge branch 'js/name-rev-use-oldest-ref'
2016-05-03  Junio C HamanoMerge branch 'jd/p4-jobs-in-commit'
2016-05-03  Junio C HamanoMerge branch 'en/merge-fixes'
2016-05-02  Junio C HamanoSync with maint
2016-04-29  Junio C HamanoSync with 2.8.2
2016-04-29  Junio C HamanoMerge branch 'st/verify-tag'
2016-04-29  Junio C HamanoMerge branch 'js/win32-mmap'
2016-04-29  Junio C HamanoMerge branch 'jc/merge-refuse-new-root'
2016-04-29  Junio C HamanoMerge branch 'jk/push-client-deadlock-fix'
2016-04-29  Junio C HamanoMerge branch 'js/replace-edit-use-editor-configuration'
2016-04-29  Junio C HamanoMerge branch 'sb/mv-submodule-fix'
2016-04-29  Junio C HamanoMerge branch 'nd/test-helpers'
2016-04-29  Junio C HamanoMerge branch 'da/user-useconfigonly'
2016-04-25  Junio C HamanoSync with maint
2016-04-25  Junio C HamanoMerge branch 'sb/submodule-path-misc-bugs'
2016-04-25  Junio C HamanoMerge branch 'en/merge-trivial-fix'
2016-04-25  Junio C HamanoMerge branch 'en/merge-octopus-fix'
2016-04-25  Junio C HamanoMerge branch 'dt/pre-refs-backend'
2016-04-25  Junio C HamanoMerge branch 'jc/rerere-multi'
2016-04-06  Junio C Hamanorerere: adjust 'forget' to multi-variant world order
2016-04-06  Junio C Hamanorerere: gc and clear
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2016-03-15  Junio C Hamanorerere: do use multiple variants
2016-03-15  Junio C Hamanot4200: rerere a merge with two identical conflicts
2016-03-15  Junio C Hamanorerere: handle leftover rr-cache/$ID directory and...
2016-02-22  Junio C HamanoMerge branch 'jk/config-include'
2015-12-21  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-11-05  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-11-03  Junio C HamanoMerge branch 'jk/initialization-fix-to-add-submodule...
2015-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-05  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix'
2015-09-17  Junio C HamanoMerge branch 'as/config-doc-markup-fix'
2015-09-17  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config' into...
2015-09-17  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error' into maint
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test'
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix'
2015-09-04  Junio C HamanoMerge branch 'ee/clean-test-fixes' into maint
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
2015-09-02  Junio C HamanoMerge branch 'ee/clean-test-fixes'
2015-09-01  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error'
2015-09-01  Junio C HamanoMerge branch 'ah/reflog-typofix-in-error'
2015-09-01  Junio C HamanoMerge branch 'ah/read-tree-usage-string'
2015-09-01  Junio C HamanoMerge branch 'ah/pack-objects-usage-strings'
2015-09-01  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-07-15  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15  Junio C HamanoMerge branch 'fk/doc-format-patch-vn' into maint
2015-07-01  Junio C HamanoMerge branch 'jc/prompt-document-ps1-state-separator'
2015-06-24  Junio C HamanoMerge branch 'fk/doc-format-patch-vn'
2015-06-16  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' into maint
2015-06-01  Junio C HamanoMerge branch 'mc/commit-doc-grammofix'
next