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

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

2010-11-24	Merge branch 'en/and-cascade-tests'	blob \| diff \| raw
2010-11-24	Merge branch 'maint'	blob \| diff \| raw
2010-11-17	Merge branch 'jl/maint-pull-tags-doc'	blob \| diff \| raw
2010-11-17	Merge branch 'kb/maint-submodule-savearg'	blob \| diff \| raw
2010-11-17	Merge branch 'kb/maint-diff-ws-check'	blob \| diff \| raw
2010-11-17	Merge branch 'bg/maint-gitweb-test-lib'	blob \| diff \| raw
2010-11-17	Merge branch 'jm/mailmap'	blob \| diff \| raw
2010-11-17	Merge branch 'tr/maint-git-repack-tmpfile'	blob \| diff \| raw
2010-11-17	Merge branch 'jk/maint-apply-no-binary'	blob \| diff \| raw
2010-11-17	Merge branch 'tr/maint-merge-file-subdir'	blob \| diff \| raw
2010-11-17	Merge branch 'jn/send-pack-error'	blob \| diff \| raw
2010-11-17	Merge branch 'ak/submodule-sync'	blob \| diff \| raw
2010-11-17	Merge branch 'jk/maint-rev-list-nul'	blob \| diff \| raw
2010-11-17	Merge branch 'ks/no-textconv-symlink'	blob \| diff \| raw
2010-11-17	Merge branch 'jn/gitweb-test'	blob \| diff \| raw
2010-11-17	Merge branch 'cb/diff-fname-optim'	blob \| diff \| raw
2010-11-17	Merge branch 'jk/no-textconv-symlink'	blob \| diff \| raw
2010-11-17	Merge branch 'dk/maint-blame-el'	blob \| diff \| raw
2010-11-17	Merge branch 'maint'	blob \| diff \| raw
2010-11-15	Merge branch 'maint'	blob \| diff \| raw
2010-11-09	Merge branch 'maint'	blob \| diff \| raw
2010-11-05	Merge branch 'aw/git-p4-deletion'	blob \| diff \| raw
2010-11-05	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| diff \| raw
2010-11-05	Merge branch 'maint'	blob \| diff \| raw
2010-10-27	Merge branch 'ab/send-email-perl'	blob \| diff \| raw
2010-10-27	Merge branch 'sb/send-email-use-to-from-input'	blob \| diff \| raw
2010-10-27	Merge branch 'ab/require-perl-5.8'	blob \| diff \| raw
2010-10-27	Merge branch 'kb/merge-recursive-rename-threshold'	blob \| diff \| raw
2010-10-27	Merge branch 'jp/send-email-to-cmd'	blob \| diff \| raw
2010-10-27	Merge branch 'as/daemon-multi-listen'	blob \| diff \| raw
2010-10-27	Merge branch 'dm/mergetool-vimdiff'	blob \| diff \| raw
2010-10-27	Merge branch 'kf/post-receive-sample-hook'	blob \| diff \| raw
2010-10-27	Merge branch 'jf/merge-ignore-ws'	blob \| diff \| raw
2010-10-27	Merge branch 'ml/completion-zsh'	blob \| diff \| raw
2010-10-27	Merge branch 'po/sendemail'	blob \| diff \| raw
2010-10-27	Merge branch 'en/tree-walk-optim'	blob \| diff \| raw
2010-10-26	Merge branch 'maint'	blob \| diff \| raw
2010-10-22	Sync with 1.7.3.2	blob \| diff \| raw
2010-10-19	Merge branch 'maint'	blob \| diff \| raw
2010-10-14	Merge branch 'maint'	blob \| diff \| raw
2010-10-06	Merge branch 'maint'	blob \| diff \| raw
2010-10-06	Merge branch 'jk/repack-reuse-object'	blob \| diff \| raw
2010-10-06	Merge branch 'bc/fix-cherry-pick-root'	blob \| diff \| raw
2010-10-06	Merge branch 'uk/fix-author-ident-sed-script'	blob \| diff \| raw
2010-10-06	Merge branch 'cw/gitweb-hilite-config'	blob \| diff \| raw
2010-10-06	Merge branch 'ab/makefile-track-cc'	blob \| diff \| raw
2010-10-06	Merge branch 'mg/reset-doc'	blob \| diff \| raw
2010-10-06	Merge branch 'maint'	blob \| diff \| raw
2010-10-06	Merge branch 'work/pt/for-junio' of git://repo.or.cz...	blob \| diff \| raw
2010-10-01	merge-octopus: Work around environment issue on Windows	blob \| diff \| raw
2010-09-18	Merge branch 'js/ls-files-x-doc'	blob \| diff \| raw \| diff to current
2010-09-15	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2010-08-19	Merge branch 'tr/xsize-bits' into maint	blob \| diff \| raw \| diff to current
2010-08-18	Merge branch 'tr/xsize-bits'	blob \| diff \| raw \| diff to current
2010-08-02	Merge git://repo.or.cz/git-gui into pt/git-gui	blob \| diff \| raw \| diff to current
2010-07-26	Merge branch 'maint-1.6.4' into maint-1.6.5	blob \| diff \| raw \| diff to current
2010-07-16	Merge branch 'jc/diff-merge-base-multi'	blob \| diff \| raw \| diff to current
2010-07-15	Merge branch 'jc/diff-merge-base-multi'	blob \| diff \| raw \| diff to current
2010-07-09	Merge remote branch 'ko/master' into jc/read-tree-cache...	blob \| diff \| raw \| diff to current
2010-07-07	Merge branch 'maint-1.6.4' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'jc/am-3-show-corrupted-patch' into maint	blob \| diff \| raw \| diff to current
2010-06-16	Merge branch 'hg/maint-attr-fix' into maint	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jn/gitweb-our-squelch'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jc/am-3-show-corrupted-patch'	blob \| diff \| raw \| diff to current
2010-05-21	Merge branch 'jc/maint-no-reflog-expire-unreach-for...	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'hg/maint-attr-fix'	blob \| diff \| raw \| diff to current
2010-05-09	Merge branch 'jc/maint-reflog-expire-unreachable'	blob \| diff \| raw \| diff to current
2010-04-23	Merge branch 'jk/maint-diffstat-overflow' into maint	blob \| diff \| raw \| diff to current
2010-04-19	Merge branch 'jk/maint-diffstat-overflow'	blob \| diff \| raw \| diff to current
2010-04-19	Merge git://git.kernel.org/pub/scm/gitk/gitk	blob \| diff \| raw \| diff to current
2010-04-11	Merge branch 'rc/maint-reflog-msg-for-forced-branch...	blob \| diff \| raw \| diff to current
2010-04-10	Merge branch 'jc/conflict-marker-size' into maint	blob \| diff \| raw \| diff to current
2010-04-10	Merge branch 'mg/maint-send-email-lazy-editor' into...	blob \| diff \| raw \| diff to current
2010-04-10	Merge branch 'rc/maint-reflog-msg-for-forced-branch'	blob \| diff \| raw \| diff to current
2010-04-06	Merge branch 'jc/conflict-marker-size'	blob \| diff \| raw \| diff to current
2010-04-03	Merge branch 'mg/maint-send-email-lazy-editor'	blob \| diff \| raw \| diff to current
2010-03-31	Merge branch 'jc/maint-refs-dangling' into maint	blob \| diff \| raw \| diff to current
2010-03-29	Merge branch 'cp/add-u-pathspec' into maint	blob \| diff \| raw \| diff to current
2010-03-24	Merge branch 'jc/maint-refs-dangling'	blob \| diff \| raw \| diff to current
2010-03-24	Merge branch 'jc/color-attrs' into maint	blob \| diff \| raw \| diff to current
2010-03-20	Merge branch 'jc/color-attrs'	blob \| diff \| raw \| diff to current
2010-03-10	Merge branch 'cp/add-u-pathspec'	blob \| diff \| raw \| diff to current
2010-03-08	Merge branch 'fn/maint-mkdtemp-compat' into maint	blob \| diff \| raw \| diff to current
2010-03-08	Merge branch 'jk/maint-push-tracking-wo-remote' into...	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'jc/maint-fix-test-perm' into maint-1.6.6	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'hm/maint-imap-send-crlf' into maint-1.6.6	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'gf/maint-sh-setup-nongit-ok' into maint...	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'jk/maint-rmdir-fix' into maint-1.6.6	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'rs/optim-text-wrap' into maint-1.6.6	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'tr/maint-cherry-pick-list' into maint...	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'fn/maint-mkdtemp-compat'	blob \| diff \| raw \| diff to current
2010-03-07	Merge branch 'jk/maint-push-tracking-wo-remote'	blob \| diff \| raw \| diff to current
2010-03-05	Merge branch 'tr/maint-cherry-pick-list' into maint	blob \| diff \| raw \| diff to current
2010-03-05	Merge branch 'rs/optim-text-wrap' into maint	blob \| diff \| raw \| diff to current
2010-03-05	Merge branch 'gf/maint-sh-setup-nongit-ok' into maint	blob \| diff \| raw \| diff to current
2010-03-03	Merge branch 'hm/maint-imap-send-crlf' into maint	blob \| diff \| raw \| diff to current
2010-03-03	Merge branch 'jc/maint-fix-test-perm' into maint	blob \| diff \| raw \| diff to current
2010-03-02	Merge branch 'tr/maint-cherry-pick-list'	blob \| diff \| raw \| diff to current
2010-03-02	Merge branch 'rs/optim-text-wrap'	blob \| diff \| raw \| diff to current
2010-03-02	Merge branch 'gf/maint-sh-setup-nongit-ok'	blob \| diff \| raw \| diff to current
next