Merge branch 'jn/vcs-svn-cleanup'
[git] / git-merge-octopus.sh
2017-08-27  Junio C HamanoMerge branch 'jn/vcs-svn-cleanup'
2017-08-27  Junio C HamanoMerge branch 'bc/vcs-svn-cleanup'
2017-08-27  Junio C HamanoMerge branch 'tb/apply-with-crlf'
2017-08-27  Junio C HamanoMerge branch 'jt/stash-tests'
2017-08-27  Junio C HamanoMerge branch 'jk/trailers-parse'
2017-08-27  Junio C HamanoMerge branch 'pb/trailers-from-command-line'
2017-08-27  Junio C HamanoMerge branch 'jt/diff-color-move-fix'
2017-08-27  Junio C HamanoMerge branch 'sb/diff-color-move'
2017-08-24  Junio C HamanoMerge branch 'jk/doc-the-this'
2017-08-24  Junio C HamanoMerge branch 'rs/commit-h-single-parent-cleanup'
2017-08-24  Junio C HamanoMerge branch 'jc/simplify-progress'
2017-08-24  Junio C HamanoMerge branch 'tc/curl-with-backports'
2017-08-24  Junio C HamanoMerge branch 'cc/subprocess-handshake-missing-capabilities'
2017-08-24  Junio C HamanoMerge branch 'rs/object-id'
2017-08-24  Junio C HamanoMerge branch 'lg/merge-signoff'
2017-08-23  Junio C HamanoSync with maint
2017-08-23  Junio C HamanoMerge branch 'mg/format-ref-doc-fix'
2017-08-23  Junio C HamanoMerge branch 'sb/submodule-parallel-update'
2017-08-23  Junio C HamanoMerge branch 'jc/diff-sane-truncate-no-more'
2017-08-23  Junio C HamanoMerge branch 'hv/t5526-andand-chain-fix'
2017-08-23  Junio C HamanoMerge branch 'as/grep-quiet-no-match-exit-code-fix'
2017-08-23  Junio C HamanoMerge branch 'kw/commit-keep-index-when-pre-commit...
2017-08-23  Junio C HamanoMerge branch 'sb/sha1-file-cleanup'
2017-08-23  Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum'
2017-08-23  Junio C HamanoMerge branch 'kd/stash-with-bash-4.4'
2017-08-23  Junio C HamanoMerge branch 'ah/doc-empty-string-is-false'
2017-08-23  Junio C HamanoMerge branch 'kw/rebase-progress'
2017-08-23  Junio C HamanoMerge branch 'ks/prepare-commit-msg-sample-fix'
2017-08-23  Junio C HamanoMerge branch 'nm/stash-untracked'
2017-08-23  Junio C HamanoMerge branch 'jt/sha1-file-cleanup'
2017-08-22  Junio C HamanoMerge branch 'mh/packed-ref-store'
2017-08-22  Junio C HamanoMerge branch 'sb/retire-t1200'
2017-08-22  Junio C HamanoMerge branch 'rs/win32-syslog-leakfix'
2017-08-22  Junio C HamanoMerge branch 'rs/unpack-entry-leakfix'
2017-08-22  Junio C HamanoMerge branch 'rs/strbuf-getwholeline-fix'
2017-08-22  Junio C HamanoMerge branch 'rs/merge-microcleanup'
2017-08-22  Junio C HamanoMerge branch 'rs/fsck-obj-leakfix'
2017-08-22  Junio C HamanoMerge branch 'rs/t4062-obsd'
2017-08-22  Junio C HamanoMerge branch 'rs/find-pack-entry-bisection'
2017-08-22  Junio C HamanoMerge branch 'rs/apply-lose-prefix-length'
2017-08-22  Junio C HamanoMerge branch 'rj/add-chmod-error-message'
2017-08-22  Junio C HamanoMerge branch 'jk/hashcmp-memcmp'
2017-08-22  Junio C HamanoMerge branch 'jk/drop-sha1-entry-pos'
2017-08-22  Junio C HamanoMerge branch 'ur/svn-local-zone'
2017-08-22  Junio C HamanoMerge branch 'pw/am-signoff'
2017-08-22  Junio C HamanoMerge branch 'rs/t3700-clean-leftover'
2017-08-22  Junio C HamanoMerge branch 'jc/perl-git-comment-typofix'
2017-08-22  Junio C HamanoMerge branch 'rs/in-obsd-basename-dirname-take-const'
2017-08-22  Junio C HamanoMerge branch 'rs/obsd-getcwd-workaround'
2017-08-22  Junio C HamanoMerge branch 'mf/no-dashed-subcommands'
2017-08-07  Michael Forneyscripts: use "git foo" not "git-foo"
2017-07-31  Junio C HamanoMerge branch 'rs/apply-avoid-over-reading' into maint
2017-07-30  Junio C HamanoMerge tag 'v2.9.5' into maint-2.10
2017-07-30  Junio C HamanoMerge tag 'v2.8.6' into maint-2.9
2017-07-25  Junio C HamanoMerge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-07-12  Junio C HamanoMerge branch 'rs/apply-avoid-over-reading'
2017-07-10  Junio C HamanoMerge branch 'js/fsck-name-object' into maint
2017-07-07  Junio C HamanoMerge branch 'rs/apply-avoid-over-reading'
2017-07-07  Junio C HamanoMerge branch 'js/fsck-name-object'
2017-06-24  Junio C HamanoMerge branch 'jc/diff-tree-stale-comment' into maint
2017-06-24  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety' into maint
2017-06-13  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety'
2017-06-13  Junio C HamanoMerge branch 'jc/diff-tree-stale-comment'
2017-06-05  Junio C HamanoMerge branch 'sg/core-filemode-doc-typofix' into maint
2017-05-29  Junio C HamanoMerge branch 'sg/core-filemode-doc-typofix'
2017-05-29  Junio C HamanoMerge branch 'jk/diff-submodule-diff-inline'
2017-05-05  Junio C HamanoMerge branch 'maint-2.9' into maint-2.10
2017-05-05  Junio C HamanoMerge branch 'maint-2.8' into maint-2.9
2017-05-01  Junio C HamanoMerge branch 'jk/submodule-init-segv-fix'
2017-05-01  Junio C HamanoMerge branch 'jk/prio-queue-avoid-swap-with-self'
2017-04-24  Junio C HamanoMerge branch 'xy/format-patch-base'
2017-04-17  Junio C HamanoMerge branch 'jc/bs-t-is-not-a-tab-for-sed'
2017-04-17  Junio C HamanoMerge branch 'jc/unused-symbols'
2017-04-11  Junio C HamanoMerge branch 'cc/untracked'
2017-03-30  Junio C HamanoMerge branch 'bc/push-cert-receive-fix'
2017-03-30  Junio C HamanoMerge branch 'jc/merge-drop-old-syntax'
2017-03-28  Junio C HamanoMerge branch 'rs/path-name-safety-cleanup' into maint
2017-03-28  Junio C HamanoMerge branch 'js/regexec-buf' into maint
2017-03-24  Junio C HamanoMerge branch 'rs/path-name-safety-cleanup'
2017-03-24  Junio C HamanoMerge branch 'js/regexec-buf'
2017-03-24  Junio C HamanoMerge branch 'sb/submodule-config-parse-ignore-fix...
2017-03-21  Junio C HamanoMerge branch 'sb/submodule-config-parse-ignore-fix'
2017-03-21  Junio C HamanoMerge branch 'jc/diff-populate-filespec-size-only-fix...
2017-03-21  Junio C HamanoMerge branch 'jk/ewah-use-right-type-in-sizeof' into...
2017-03-13  Junio C HamanoMerge branch 'jc/diff-populate-filespec-size-only-fix'
2017-03-13  Junio C HamanoMerge branch 'jk/ewah-use-right-type-in-sizeof'
2017-02-24  Junio C HamanoMerge branch 'bc/worktree-doc-fix-detached'
2017-02-24  Junio C HamanoMerge branch 'rt/align-add-i-help-text'
2017-02-24  Junio C HamanoMerge branch 'bc/blame-doc-fix'
2017-02-16  Junio C HamanoMerge branch 'dp/submodule-doc-markup-fix'
2017-02-16  Junio C HamanoMerge branch 'ls/p4-path-encoding'
2017-02-15  Junio C HamanoMerge branch 'jk/doc-remote-helpers-markup-fix'
2017-02-15  Junio C HamanoMerge branch 'sb/doc-unify-bottom'
2017-02-10  Junio C HamanoMerge branch 'jk/log-graph-name-only'
2017-02-10  Junio C HamanoMerge branch 'ps/worktree-prune-help-fix'
2017-02-08  Junio C HamanoMerge branch 'da/difftool-dir-diff-fix' into da/t7800...
2017-02-02  Junio C HamanoMerge branch 'nd/log-graph-configurable-colors'
2017-02-02  Junio C HamanoMerge branch 'mm/reset-facl-before-umask-test'
2017-02-02  Junio C HamanoMerge branch 'ws/request-pull-code-cleanup' into maint
2017-01-31  Junio C HamanoMerge branch 'ad/bisect-terms' into maint
next