Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'
[git] / git-merge-octopus.sh
2016-09-21  Junio C HamanoMerge branch 'rs/xdiff-merge-overlapping-hunks-for...
2016-09-21  Junio C HamanoMerge branch 'rs/unpack-trees-reduce-file-scope-global'
2016-09-21  Junio C HamanoMerge branch 'rs/strbuf-remove-fix'
2016-09-21  Junio C HamanoMerge branch 'rs/pack-sort-with-llist-mergesort'
2016-09-21  Junio C HamanoMerge branch 'rs/checkout-some-states-are-const'
2016-09-21  Junio C HamanoMerge branch 'jk/setup-sequence-update'
2016-09-21  Junio C HamanoMerge branch 'ew/http-do-not-forget-to-call-curl-multi...
2016-09-21  Junio C HamanoMerge branch 'bw/pathspec-remove-unused-extern-decl'
2016-09-21  Junio C HamanoMerge branch 'ks/pack-objects-bitmap'
2016-09-21  Junio C HamanoMerge branch 'jk/patch-ids-no-merges'
2016-09-21  Junio C HamanoMerge branch 'jk/delta-base-cache'
2016-09-21  Junio C HamanoMerge branch 'et/add-chmod-x'
2016-09-21  Junio C HamanoMerge branch 'js/cat-file-filters'
2016-09-21  Junio C HamanoMerge branch 'jt/accept-capability-advertisement-when...
2016-09-19  Junio C HamanoMerge branch 'sb/diff-cleanup' into maint
2016-09-19  Junio C HamanoMerge branch 'ah/misc-message-fixes' into maint
2016-09-19  Junio C HamanoMerge branch 'sb/xdiff-remove-unused-static-decl' into...
2016-09-19  Junio C HamanoMerge branch 'js/t9903-chaining' into maint
2016-09-19  Junio C HamanoMerge branch 'rs/hex2chr' into maint
2016-09-19  Junio C HamanoMerge branch 'rs/compat-strdup' into maint
2016-09-19  Junio C HamanoMerge branch 'jk/squelch-false-warning-from-gcc-o3...
2016-09-19  Junio C HamanoMerge branch 'jc/forbid-symbolic-ref-d-HEAD' into maint
2016-09-19  Junio C HamanoMerge branch 'jc/submodule-anchor-git-dir' into maint
2016-09-19  Junio C HamanoMerge branch 'jk/test-lib-drop-pid-from-results' into...
2016-09-19  Junio C HamanoMerge branch 'po/range-doc' into maint
2016-09-19  Junio C HamanoMerge branch 'bc/object-id'
2016-09-19  Junio C HamanoMerge branch 'mh/ref-store'
2016-09-19  Junio C HamanoMerge branch 'cc/apply-am'
2016-09-15  Junio C HamanoMerge branch 'js/git-gui-commit-gpgsign'
2016-09-15  Junio C HamanoMerge branch 'js/sequencer-wo-die'
2016-09-15  Junio C HamanoMerge branch 'sb/diff-cleanup'
2016-09-15  Junio C HamanoMerge branch 'jk/fix-remote-curl-url-wo-proto'
2016-09-15  Junio C HamanoMerge branch 'ah/misc-message-fixes'
2016-09-15  Junio C HamanoMerge branch 'jk/pack-tag-of-tag'
2016-09-12  Junio C HamanoMerge branch 'sb/xdiff-remove-unused-static-decl'
2016-09-12  Junio C HamanoMerge branch 'js/t9903-chaining'
2016-09-12  Junio C HamanoMerge branch 'rs/hex2chr'
2016-09-12  Junio C HamanoMerge branch 'rs/compat-strdup'
2016-09-12  Junio C HamanoMerge branch 'jc/forbid-symbolic-ref-d-HEAD'
2016-09-12  Junio C HamanoMerge branch 'jc/submodule-anchor-git-dir'
2016-09-12  Junio C HamanoMerge branch 'jk/squelch-false-warning-from-gcc-o3'
2016-09-12  Junio C HamanoMerge branch 'jk/test-lib-drop-pid-from-results'
2016-09-11  Junio C HamanoMerge branch 'js/commit-gpgsign' of ../git-gui into...
2016-09-09  Junio C HamanoMerge branch 'hv/doc-commit-reference-style'
2016-09-09  Junio C HamanoMerge branch 'po/range-doc'
2016-09-09  Junio C HamanoMerge branch 'rt/help-unknown'
2016-09-09  Junio C HamanoMerge branch 'jk/format-patch-number-singleton-patch...
2016-09-09  Junio C HamanoStart maintenance track for 2.10.x series
2016-09-09  Junio C HamanoMerge branch 'hv/doc-commit-reference-style' into maint
2016-09-09  Junio C HamanoMerge branch 'rs/mailinfo-lib' into maint
2016-09-09  Junio C HamanoMerge branch 'jk/tighten-alloc' into maint
2016-09-09  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix' into...
2016-09-09  Junio C HamanoMerge branch 'dg/document-git-c-in-git-config-doc'...
2016-09-09  Junio C HamanoMerge branch 'js/no-html-bypass-on-windows' into maint
2016-09-09  Junio C HamanoMerge branch 'js/import-tars-hardlinks' into maint
2016-09-09  Junio C HamanoMerge branch 'jk/push-force-with-lease-creation' into...
2016-09-09  Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf...
2016-09-08  Alex Henriegit-merge-octopus: do not capitalize "octopus"
2016-09-07  Junio C HamanoMerge branch 'sy/i18n' of git-gui
2016-08-31  Junio C HamanoMerge branch 'ls/packet-line-protocol-doc-fix'
2016-08-31  Junio C HamanoMerge branch 'mh/blame-worktree'
2016-08-31  Junio C HamanoMerge branch 'kw/patch-ids-optim'
2016-08-26  Junio C HamanoMerge branch 'js/no-html-bypass-on-windows' into rt...
2016-08-25  Junio C HamanoMerge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'
2016-08-25  Junio C HamanoMerge branch 'dg/document-git-c-in-git-config-doc'
2016-08-25  Junio C HamanoMerge branch 'js/no-html-bypass-on-windows'
2016-08-25  Junio C HamanoMerge branch 'hv/doc-commit-reference-style'
2016-08-19  Junio C HamanoMerge branch 'ab/hooks'
2016-08-19  Junio C HamanoMerge branch 'jk/difftool-command-not-found'
2016-08-19  Junio C HamanoMerge branch 'sb/checkout-explit-detach-no-advice'
2016-08-19  Junio C HamanoMerge branch 'tb/t0027-raciness-fix'
2016-08-19  Junio C HamanoMerge branch 'rs/pull-signed-tag'
2016-08-17  Junio C HamanoMerge branch 'js/test-lint-pathname'
2016-08-17  Junio C HamanoMerge branch 'sg/reflog-past-root'
2016-08-17  Junio C HamanoMerge branch 'rs/mailinfo-lib'
2016-08-17  Junio C HamanoMerge branch 'jk/tighten-alloc'
2016-08-16  Junio C HamanoMerge branch 'lt/gpg-show-long-key-in-signature-verific...
2016-08-12  Junio C HamanoSync with 2.9.3
2016-08-12  Junio C HamanoMerge branch 'kw/patch-ids-optim'
2016-08-12  Junio C HamanoMerge branch 'ew/http-backend-batch-headers'
2016-08-12  Junio C HamanoMerge branch 'js/mv-dir-to-new-directory'
2016-08-12  Junio C HamanoMerge branch 'rs/use-strbuf-add-unique-abbrev'
2016-08-12  Junio C HamanoMerge branch 'jk/big-and-future-archive-tar'
2016-08-12  Junio C HamanoMerge branch 'rs/merge-recursive-string-list-init'
2016-08-12  Junio C HamanoMerge branch 'rs/merge-add-strategies-simplification'
2016-08-12  Junio C HamanoMerge branch 'js/import-tars-hardlinks'
2016-08-12  Junio C HamanoMerge branch 'ms/document-pack-window-memory-is-per...
2016-08-12  Junio C HamanoMerge branch 'vs/completion-branch-fully-spelled-d...
2016-08-12  Junio C HamanoMerge branch 'sb/submodule-clone-retry'
2016-08-12  Junio C HamanoMerge branch 'jk/reset-ident-time-per-commit' into...
2016-08-10  Junio C HamanoSync with maint
2016-08-10  Junio C HamanoMerge branch 'js/commit-slab-decl-fix'
2016-08-10  Junio C HamanoMerge branch 'jk/completion-diff-submodule'
2016-08-10  Junio C HamanoMerge branch 'cc/mailmap-tuxfamily'
2016-08-10  Junio C HamanoMerge branch 'jt/format-patch-from-config'
2016-08-10  Junio C HamanoMerge branch 'jk/push-force-with-lease-creation'
2016-08-10  Junio C HamanoMerge branch 'jk/reset-ident-time-per-commit'
2016-08-10  Junio C HamanoMerge branch 'cp/completion-clone-recurse-submodules...
2016-08-10  Junio C HamanoMerge branch 'jc/hashmap-doc-init' into maint
2016-08-10  Junio C HamanoMerge branch 'ab/gitweb-link-html-escape' into maint
next