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

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

2017-12-27	Merge branch 'jk/cvsimport-quoting'	blob \| diff \| raw
2017-12-27	Merge branch 'rs/strbuf-read-once-reset-length'	blob \| diff \| raw
2017-12-27	Merge branch 'rs/fmt-merge-msg-string-leak-fix'	blob \| diff \| raw
2017-12-27	Merge branch 'rs/am-builtin-leakfix'	blob \| diff \| raw
2017-12-27	Merge branch 'tb/check-crlf-for-safe-crlf'	blob \| diff \| raw
2017-12-19	Merge branch 'sg/setup-doc-update'	blob \| diff \| raw
2017-12-19	Merge branch 'bw/submodule-config-cleanup'	blob \| diff \| raw
2017-12-19	Merge branch 'bw/pathspec-match-submodule-boundary'	blob \| diff \| raw
2017-12-13	Merge branch 'jk/no-optional-locks'	blob \| diff \| raw
2017-12-13	Merge branch 'ks/doc-checkout-previous'	blob \| diff \| raw
2017-12-13	Merge branch 'jc/receive-pack-hook-doc'	blob \| diff \| raw
2017-12-06	Merge branch 'sp/doc-info-attributes'	blob \| diff \| raw
2017-12-06	Merge branch 'ph/stash-save-m-option-fix'	blob \| diff \| raw
2017-12-06	Merge branch 'jk/fewer-pack-rescan'	blob \| diff \| raw
2017-12-06	Merge branch 'rd/doc-notes-prune-fix'	blob \| diff \| raw
2017-12-06	Merge branch 'rd/man-reflog-add-n'	blob \| diff \| raw
2017-12-06	Merge branch 'rd/man-prune-progress'	blob \| diff \| raw
2017-12-06	Merge branch 'tz/branch-doc-remove-set-upstream'	blob \| diff \| raw
2017-12-06	Merge branch 'sb/submodule-recursive-checkout-detach...	blob \| diff \| raw
2017-12-06	Merge branch 'jc/merge-base-fork-point-doc' into maint	blob \| diff \| raw
2017-12-06	Merge branch 'tz/redirect-fix' into maint	blob \| diff \| raw
2017-12-06	Merge branch 'tz/notes-error-to-stderr' into maint	blob \| diff \| raw
2017-12-06	Merge branch 'rs/apply-inaccurate-eof-with-incomplete...	blob \| diff \| raw
2017-12-06	Merge branch 'tz/complete-branch-copy' into maint	blob \| diff \| raw
2017-12-06	Merge branch 'sd/branch-copy' into maint	blob \| diff \| raw
2017-12-06	Merge branch 'sw/pull-ipv46-passthru' into maint	blob \| diff \| raw
2017-12-06	Merge branch 'mh/avoid-rewriting-packed-refs' into...	blob \| diff \| raw
2017-12-05	Merge branch 'ls/no-double-utf8-author-name' of .....	blob \| diff \| raw
2017-11-28	Merge branch 'ma/branch-list-paginate'	blob \| diff \| raw
2017-11-27	Merge branch 'sw/pull-ipv46-passthru'	blob \| diff \| raw
2017-11-27	Merge branch 'ks/rebase-no-git-foo'	blob \| diff \| raw
2017-11-27	Merge branch 'tz/complete-branch-copy'	blob \| diff \| raw
2017-11-27	Merge branch 'rs/apply-inaccurate-eof-with-incomplete...	blob \| diff \| raw
2017-11-27	Merge branch 'sd/branch-copy'	blob \| diff \| raw
2017-11-27	Merge branch 'tz/notes-error-to-stderr'	blob \| diff \| raw
2017-11-27	Merge branch 'tz/redirect-fix'	blob \| diff \| raw
2017-11-27	Merge branch 'jc/merge-base-fork-point-doc'	blob \| diff \| raw
2017-11-27	Merge branch 'jc/ignore-cr-at-eol'	blob \| diff \| raw
2017-11-27	Merge branch 'rs/apply-fuzzy-match-fix' into maint	blob \| diff \| raw
2017-11-27	Merge branch 'rs/imap-send-next-arg-fix' into maint	blob \| diff \| raw
2017-11-22	Merge branch 'jn/reproducible-build' of ../git-gui...	blob \| diff \| raw
2017-11-21	Merge branch 'rs/apply-fuzzy-match-fix'	blob \| diff \| raw
2017-11-21	Merge branch 'cb/t4201-robustify' into maint	blob \| diff \| raw
2017-11-21	Merge branch 'ad/rebase-i-serie-typofix' into maint	blob \| diff \| raw
2017-11-21	Merge branch 'jk/info-alternates-fix' into maint	blob \| diff \| raw
2017-11-21	Merge branch 'ab/pcre-v2' into maint	blob \| diff \| raw
2017-11-21	Merge branch 'bw/rebase-i-ignored-submodule-fix' into...	blob \| diff \| raw
2017-11-15	Merge branch 'bp/read-index-from-skip-verification'	blob \| diff \| raw
2017-11-15	Merge branch 'jk/info-alternates-fix'	blob \| diff \| raw
2017-11-15	Merge branch 'cb/t4201-robustify'	blob \| diff \| raw
2017-11-15	Merge branch 'ab/pcre-v2'	blob \| diff \| raw
2017-11-15	Merge branch 'ad/rebase-i-serie-typofix'	blob \| diff \| raw
2017-11-15	Merge branch 'bw/rebase-i-ignored-submodule-fix'	blob \| diff \| raw
2017-11-15	Merge branch 'ao/merge-verbosity-getenv-just-once'	blob \| diff \| raw
2017-11-15	Merge branch 'mh/avoid-rewriting-packed-refs'	blob \| diff \| raw
2017-11-15	Merge branch 'rs/imap-send-next-arg-fix'	blob \| diff \| raw
2017-11-15	Merge branch 'cn/diff-indent-no-longer-is-experimental...	blob \| diff \| raw
2017-11-15	Merge branch 'js/mingw-full-version-in-resources' into...	blob \| diff \| raw
2017-11-15	Merge branch 'dk/libsecret-unlock-to-load-fix' into...	blob \| diff \| raw
2017-11-15	Merge branch 'js/early-config' into maint	blob \| diff \| raw
2017-11-15	Merge branch 'ad/5580-unc-tests-on-cygwin' into maint	blob \| diff \| raw
2017-11-15	Merge branch 'ao/diff-populate-filespec-lstat-errorpath...	blob \| diff \| raw
2017-11-15	Merge branch 'sb/blame-config-doc' into maint	blob \| diff \| raw
2017-11-15	Merge branch 'jc/check-ref-format-oor' into maint	blob \| diff \| raw
2017-11-15	Merge branch 'jk/rebase-i-exec-gitdir-fix' into maint	blob \| diff \| raw
2017-11-15	Merge branch 'bw/grep-recurse-submodules' into maint	blob \| diff \| raw
2017-11-15	Merge branch 'js/submodule-in-excluded' into maint	blob \| diff \| raw
2017-11-15	Merge branch 'ao/check-resolve-ref-unsafe-result' into...	blob \| diff \| raw
2017-11-15	Merge branch 'kd/auto-col-with-pager-fix' into maint	blob \| diff \| raw
2017-11-15	Merge branch 'sg/travis-fixes' into maint	blob \| diff \| raw
2017-11-09	Merge branch 'js/mingw-full-version-in-resources'	blob \| diff \| raw
2017-11-09	Merge branch 'dk/libsecret-unlock-to-load-fix'	blob \| diff \| raw
2017-11-09	Merge branch 'js/early-config'	blob \| diff \| raw
2017-11-09	Merge branch 'sg/travis-fixes'	blob \| diff \| raw
2017-11-09	Merge branch 'ad/5580-unc-tests-on-cygwin'	blob \| diff \| raw
2017-11-09	Merge branch 'ao/diff-populate-filespec-lstat-errorpath...	blob \| diff \| raw
2017-11-09	Merge branch 'sb/blame-config-doc'	blob \| diff \| raw
2017-11-09	Merge branch 'tz/fsf-address-update' of ../git-gui...	blob \| diff \| raw
2017-11-06	Merge branch 'gc/gitweb-filetest-acl'	blob \| diff \| raw
2017-11-06	Merge branch 'jc/check-ref-format-oor'	blob \| diff \| raw
2017-11-06	Merge branch 'jk/revision-pruning-optim'	blob \| diff \| raw
2017-11-06	Merge branch 'ex/deprecate-empty-pathspec-as-match...	blob \| diff \| raw
2017-11-06	Merge branch 'jk/rebase-i-exec-gitdir-fix'	blob \| diff \| raw
2017-11-06	Merge branch 'cn/diff-indent-no-longer-is-experimental'	blob \| diff \| raw
2017-11-06	Merge branch 'bw/grep-recurse-submodules'	blob \| diff \| raw
2017-11-06	Merge branch 'js/submodule-in-excluded'	blob \| diff \| raw
2017-11-06	Merge branch 'ao/check-resolve-ref-unsafe-result'	blob \| diff \| raw
2017-11-06	Merge branch 'kd/auto-col-with-pager-fix'	blob \| diff \| raw
2017-11-06	Merge branch 'jc/no-cmd-as-subroutine'	blob \| diff \| raw
2017-10-28	Merge branch 'sg/rev-list-doc-reorder-fix'	blob \| diff \| raw
2017-10-28	Merge branch 'sb/rev-parse-show-superproject-root'	blob \| diff \| raw
2017-10-28	Merge branch 'ao/path-use-xmalloc'	blob \| diff \| raw
2017-10-28	Merge branch 'np/config-path-doc'	blob \| diff \| raw
2017-10-26	Merge branch 'mh/ref-locking-fix'	blob \| diff \| raw
2017-10-23	Sync with 2.14.3	blob \| diff \| raw
2017-10-23	Merge branch 'jc/fetch-refspec-doc-update' into maint	blob \| diff \| raw \| diff to current
2017-10-23	Merge branch 'ma/ts-cleanups' into maint	blob \| diff \| raw \| diff to current
2017-10-23	Merge branch 'ls/travis-scriptify' into maint	blob \| diff \| raw \| diff to current
2017-10-23	Merge branch 'jt/fast-export-copy-modify-fix' into...	blob \| diff \| raw \| diff to current
2017-10-23	Merge branch 'nd/worktree-kill-parse-ref' into maint	blob \| diff \| raw \| diff to current
next