Andrew's git - gitweb.git/history - git-merge-octopus.sh

[gitweb.git] / git-merge-octopus.sh

2016-05-10	Merge branch 'sk/gitweb-highlight-encoding'	blob \| diff \| raw
2016-05-10	Merge branch 'sb/clean-test-fix'	blob \| diff \| raw
2016-05-10	Merge branch 'rn/glossary-typofix'	blob \| diff \| raw
2016-05-10	Merge branch 'ls/travis-submitting-patches'	blob \| diff \| raw
2016-05-10	Merge branch 'js/close-packs-before-gc'	blob \| diff \| raw
2016-05-10	Merge branch 'ew/normal-to-e'	blob \| diff \| raw
2016-05-10	Merge branch 'ls/p4-lfs'	blob \| diff \| raw
2016-05-10	Merge branch 'sb/misc-cleanups'	blob \| diff \| raw
2016-05-10	Merge branch 'ew/doc-split-pack-disables-bitmap'	blob \| diff \| raw
2016-05-06	Sync with maint	blob \| diff \| raw
2016-05-06	Merge branch 'jk/diff-compact-heuristic'	blob \| diff \| raw
2016-05-06	Merge branch 'ls/p4-lfs-test-fix-2.7.0'	blob \| diff \| raw
2016-05-06	Merge branch 'bc/object-id'	blob \| diff \| raw
2016-05-06	Merge branch 'bw/rebase-merge-entire-branch'	blob \| diff \| raw
2016-05-06	Merge branch 'jc/drop-git-spec-in'	blob \| diff \| raw
2016-05-06	Merge branch 'js/http-custom-headers'	blob \| diff \| raw
2016-05-06	Merge branch 'sb/clone-shallow-passthru'	blob \| diff \| raw
2016-05-06	Merge branch 'ld/p4-test-py3'	blob \| diff \| raw
2016-05-06	Merge branch 'sb/config-exit-status-list'	blob \| diff \| raw
2016-05-03	Sync with maint	blob \| diff \| raw
2016-05-03	Merge branch 'nf/mergetool-prompt'	blob \| diff \| raw
2016-05-03	Merge branch 'jd/send-email-to-whom'	blob \| diff \| raw
2016-05-03	Merge branch 'rt/string-list-lookup-cleanup'	blob \| diff \| raw
2016-05-03	Merge branch 'jk/fix-attribute-macro-in-2.5'	blob \| diff \| raw
2016-05-03	Merge branch 'sg/test-lib-simplify-expr-away'	blob \| diff \| raw
2016-05-03	Merge branch 'nd/remove-unused'	blob \| diff \| raw
2016-05-03	Merge branch 'js/name-rev-use-oldest-ref'	blob \| diff \| raw
2016-05-03	Merge branch 'jd/p4-jobs-in-commit'	blob \| diff \| raw
2016-05-03	Merge branch 'en/merge-fixes'	blob \| diff \| raw
2016-05-02	Sync with maint	blob \| diff \| raw
2016-04-29	Sync with 2.8.2	blob \| diff \| raw
2016-04-29	Merge branch 'st/verify-tag'	blob \| diff \| raw
2016-04-29	Merge branch 'js/win32-mmap'	blob \| diff \| raw
2016-04-29	Merge branch 'jc/merge-refuse-new-root'	blob \| diff \| raw
2016-04-29	Merge branch 'jk/push-client-deadlock-fix'	blob \| diff \| raw
2016-04-29	Merge branch 'js/replace-edit-use-editor-configuration'	blob \| diff \| raw
2016-04-29	Merge branch 'sb/mv-submodule-fix'	blob \| diff \| raw
2016-04-29	Merge branch 'nd/test-helpers'	blob \| diff \| raw
2016-04-29	Merge branch 'da/user-useconfigonly'	blob \| diff \| raw
2016-04-25	Sync with maint	blob \| diff \| raw
2016-04-25	Merge branch 'sb/submodule-path-misc-bugs'	blob \| diff \| raw
2016-04-25	Merge branch 'en/merge-trivial-fix'	blob \| diff \| raw
2016-04-25	Merge branch 'en/merge-octopus-fix'	blob \| diff \| raw
2016-04-13	merge-octopus: abort if index does not match HEAD	blob \| diff \| raw
2016-03-21	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-12-21	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-10-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-10-16	Merge branch 'jk/make-findstring-makeflags-fix' into...	blob \| diff \| raw \| diff to current
2015-10-05	Merge branch 'jk/make-findstring-makeflags-fix'	blob \| diff \| raw \| diff to current
2015-09-14	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-09-14	Merge branch 'mp/t7060-diff-index-test'	blob \| diff \| raw \| diff to current
2015-09-14	Merge branch 'gb/apply-comment-typofix'	blob \| diff \| raw \| diff to current
2015-09-04	Merge branch 'sg/t3020-typofix' into maint	blob \| diff \| raw \| diff to current
2015-08-26	Merge branch 'sg/t3020-typofix'	blob \| diff \| raw \| diff to current
2015-06-16	Merge branch 'mc/commit-doc-grammofix' into maint	blob \| diff \| raw \| diff to current
2015-06-01	Merge branch 'mc/commit-doc-grammofix'	blob \| diff \| raw \| diff to current
2015-05-26	Merge branch 'sg/complete-decorate-full-not-long' into...	blob \| diff \| raw \| diff to current
2015-05-11	Merge branch 'sg/complete-decorate-full-not-long'	blob \| diff \| raw \| diff to current
2015-04-19	Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui	blob \| diff \| raw \| diff to current
2015-03-24	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2015-03-05	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| diff \| raw \| diff to current
2015-02-25	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| diff \| raw \| diff to current
2015-02-25	Merge branch 'jk/remote-curl-an-array-in-struct-cannot...	blob \| diff \| raw \| diff to current
2015-02-17	Merge branch 'jk/remote-curl-an-array-in-struct-cannot...	blob \| diff \| raw \| diff to current
2015-01-12	Merge branch 'rw/apply-does-not-take-ignore-date' into...	blob \| diff \| raw \| diff to current
2014-12-22	Merge branch 'rw/apply-does-not-take-ignore-date'	blob \| diff \| raw \| diff to current
2014-10-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-10-29	Merge branch 'bc/asciidoc-pretty-formats-fix' into...	blob \| diff \| raw \| diff to current
2014-10-14	Merge branch 'bc/asciidoc-pretty-formats-fix'	blob \| diff \| raw \| diff to current
2014-09-30	Merge branch 'sb/merge-recursive-copy-paste-fix'	blob \| diff \| raw \| diff to current
2014-09-26	Merge branch 'sb/help-unknown-command-sort-fix'	blob \| diff \| raw \| diff to current
2014-08-10	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-06-27	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-06-26	Merge early parts from git://ozlabs.org/~paulus/gitk.git	blob \| diff \| raw \| diff to current
2014-06-26	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2014-05-19	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| diff \| raw \| diff to current
2014-01-23	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-01-21	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| diff \| raw \| diff to current
2014-01-14	Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...	blob \| diff \| raw \| diff to current
2013-12-09	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2013-12-09	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-11-07	Merge branch 'vd/doc-unpack-objects' into maint	blob \| diff \| raw \| diff to current
2013-11-04	Merge branch 'vd/doc-unpack-objects'	blob \| diff \| raw \| diff to current
2013-10-30	Merge branch 'jk/refs-c-squelch-gcc'	blob \| diff \| raw \| diff to current
2013-10-30	Merge branch 'jk/date-c-double-semicolon'	blob \| diff \| raw \| diff to current
2013-10-14	Merge branch 'rj/highlight-test-hang'	blob \| diff \| raw \| diff to current
2013-06-17	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2013-05-17	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-05-13	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| diff \| raw \| diff to current
2013-02-04	Merge branch 'dl/am-hg-locale' into maint	blob \| diff \| raw \| diff to current
2013-01-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-01-28	Merge branch 'dl/am-hg-locale'	blob \| diff \| raw \| diff to current
2013-01-23	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jk/shortlog-no-wrap-doc' into maint	blob \| diff \| raw \| diff to current
2013-01-12	Merge branch 'jk/shortlog-no-wrap-doc'	blob \| diff \| raw \| diff to current
2013-01-10	Merge branch 'ta/remove-stale-translated-tut' into...	blob \| diff \| raw \| diff to current
2013-01-08	Merge branch 'ta/remove-stale-translated-tut'	blob \| diff \| raw \| diff to current
2012-10-17	Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2012-10-08	Merge branch 'os/commit-submodule-ignore' into maint	blob \| diff \| raw \| diff to current
next