Merge branch 'rb/hpe'
[git] / builtin / merge-ours.c
2019-01-18  Junio C HamanoMerge branch 'rb/hpe'
2019-01-18  Junio C HamanoMerge branch 'ed/simplify-setup-git-dir'
2019-01-18  Junio C HamanoMerge branch 'cy/zsh-completion-SP-in-path'
2019-01-18  Junio C HamanoMerge branch 'cy/completion-typofix'
2019-01-18  Junio C HamanoMerge branch 'ew/ban-strncat'
2019-01-18  Junio C HamanoMerge branch 'ds/commit-graph-assert-missing-parents'
2019-01-18  Junio C HamanoMerge branch 'es/doc-worktree-guessremote-config'
2019-01-18  Junio C HamanoMerge branch 'sb/submodule-unset-core-worktree-when...
2019-01-18  Junio C HamanoMerge branch 'ma/asciidoctor'
2019-01-18  Junio C HamanoMerge branch 'jn/stripspace-wo-repository'
2019-01-18  Junio C HamanoMerge branch 'sb/submodule-fetchjobs-default-to-one'
2019-01-18  Junio C HamanoMerge branch 'la/quiltimport-keep-non-patch'
2019-01-18  Junio C HamanoMerge branch 'nd/style-opening-brace'
2019-01-18  Junio C HamanoMerge branch 'ds/gc-doc-typofix'
2019-01-14  Junio C HamanoMerge branch 'do/gitweb-strict-export-conf-doc'
2019-01-14  Junio C HamanoMerge branch 'nd/indentation-fix'
2019-01-14  Junio C HamanoMerge branch 'en/directory-renames-nothanks-doc-update'
2019-01-14  Junio C HamanoMerge branch 'bw/mailmap'
2019-01-14  Junio C HamanoMerge branch 'fd/gitweb-snapshot-conf-doc-fix'
2019-01-14  Junio C HamanoMerge branch 'tb/use-common-win32-pathfuncs-on-cygwin'
2019-01-14  Junio C HamanoMerge branch 'km/rebase-doc-typofix'
2019-01-14  Junio C HamanoMerge branch 'md/exclude-promisor-objects-fix-cleanup'
2019-01-14  Junio C HamanoMerge branch 'tb/log-G-binary'
2019-01-14  Junio C HamanoMerge branch 'sb/diff-color-moved-config-option-fixup'
2019-01-14  Junio C HamanoMerge branch 'hn/highlight-sideband-keywords'
2019-01-14  Junio C HamanoMerge branch 'cb/test-lint-cp-a'
2019-01-14  Junio C HamanoMerge branch 'cb/t5004-empty-tar-archive-fix'
2019-01-14  Junio C HamanoMerge branch 'cb/openbsd-allows-reading-directory'
2019-01-14  Junio C HamanoMerge branch 'hb/t0061-dot-in-path-fix'
2019-01-14  Junio C HamanoMerge branch 'nd/checkout-noisy'
2019-01-14  Junio C HamanoMerge branch 'ab/commit-graph-progress-fix'
2019-01-14  Junio C HamanoMerge branch 'nd/attr-pathspec-in-tree-walk'
2019-01-14  Junio C HamanoMerge branch 'md/list-lazy-objects-fix'
2019-01-04  Junio C HamanoMerge branch 'mk/http-backend-kill-children-before...
2019-01-04  Junio C HamanoMerge branch 'sd/stash-wo-user-name'
2019-01-04  Junio C HamanoMerge branch 'sg/clone-initial-fetch-configuration'
2019-01-04  Junio C HamanoMerge branch 'nd/checkout-dwim-fix'
2019-01-04  Junio C HamanoMerge branch 'ab/push-dwim-dst'
2019-01-04  Junio C HamanoMerge branch 'en/fast-export-import'
2019-01-04  Junio C HamanoMerge branch 'nd/the-index'
2018-11-21  Junio C HamanoMerge branch 'nd/packobjectshook-doc-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'jk/check-everything-connected-is-long...
2018-11-21  Junio C HamanoMerge branch 'np/log-graph-octopus-fix' into maint
2018-11-21  Junio C HamanoMerge branch 'nd/attr-pathspec-fix' into maint
2018-11-12  Nguyễn Thái Ngọc Duydiff-lib.c: remove the_repository references
2018-10-31  Junio C HamanoAdjust for 2.19.x series
2018-10-26  Junio C HamanoMerge branch 'np/log-graph-octopus-fix'
2018-10-25  Junio C Hamanot0061: adjust to test-tool transition
2018-10-16  Junio C HamanoMerge branch 'nd/packobjectshook-doc-fix'
2018-10-16  Junio C HamanoMerge branch 'jk/check-everything-connected-is-long...
2018-09-27  Junio C HamanoSync with 2.15.3
2018-09-24  Junio C HamanoMerge branch 'nd/attr-pathspec-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t7501-thinkofix'
2018-08-27  Junio C HamanoMerge branch 'sg/t0020-conversion-fix'
2018-08-27  Junio C HamanoMerge branch 'sg/t4051-fix'
2018-08-27  Junio C HamanoMerge branch 'js/larger-timestamps'
2018-08-20  Junio C HamanoMerge branch 'nd/cherry-pick-quit-fix'
2018-08-20  Junio C HamanoMerge branch 'sb/pull-rebase-submodule'
2018-08-20  Junio C HamanoMerge branch 'js/typofixes'
2018-08-17  Junio C HamanoMerge branch 'en/t3031-title-fix'
2018-08-15  Junio C HamanoMerge branch 'sb/histogram-less-memory'
2018-08-15  Junio C HamanoMerge branch 'sg/fast-import-dump-refs-on-checkpoint...
2018-08-15  Junio C HamanoMerge branch 'jk/ui-color-always-to-auto'
2018-08-02  Junio C HamanoMerge branch 'sg/httpd-test-unflake'
2018-07-24  Junio C HamanoMerge branch 'jk/fetch-all-peeled-fix'
2018-06-28  Junio C HamanoMerge branch 'jk/fetch-all-peeled-fix'
2018-06-28  Junio C HamanoMerge branch 'jh/partial-clone'
2018-06-18  Junio C HamanoMerge branch 'ks/branch-set-upstream'
2018-06-18  Junio C HamanoMerge branch 'mw/doc-merge-enumfix'
2018-06-18  Junio C HamanoMerge branch 'km/doc-workflows-typofix'
2018-06-18  Junio C HamanoMerge branch 'rd/diff-options-typofix'
2018-05-30  Junio C HamanoMerge branch 'sb/grep-die-on-unreadable-index'
2018-05-30  Junio C HamanoMerge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-30  Junio C HamanoMerge branch 'nd/repo-clear-keep-the-index'
2018-05-23  Junio C HamanoMerge branch 'tb/test-apfs-utf8-normalization'
2018-05-22  Junio C HamanoSync with Git 2.15.2
2018-05-22  Jeff KingMerge branch 'jk/submodule-name-verify-fix' into jk...
2018-05-08  Junio C HamanoMerge branch 'nd/submodule-status-fix'
2018-05-08  Junio C HamanoMerge branch 'ab/git-svn-get-record-typofix'
2018-05-08  Junio C HamanoMerge branch 'sg/doc-gc-quote-mismatch-fix'
2018-04-25  Junio C HamanoMerge branch 'bp/fsmonitor-bufsize-fix'
2018-04-25  Junio C HamanoMerge branch 'es/fread-reads-dir-autoconf-fix'
2018-04-25  Junio C HamanoMerge branch 'js/t5404-path-fix'
2018-04-25  Junio C HamanoMerge branch 'mn/send-email-credential-doc'
2018-04-25  Junio C HamanoMerge branch 'ak/bisect-doc-typofix'
2018-04-25  Junio C HamanoMerge branch 'bw/commit-partial-from-subdirectory-fix'
2018-04-25  Junio C HamanoMerge branch 'jk/flockfile-stdio'
2018-04-10  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion...
2018-04-10  Junio C HamanoMerge branch 'jk/diff-highlight-graph-fix'
2018-04-09  Junio C HamanoMerge branch 'tg/stash-untracked-with-pathspec-fix'
2018-03-29  Junio C HamanoMerge branch 'jh/partial-clone'
2018-03-22  Junio C HamanoMerge branch 'sm/mv-dry-run-update' into maint
2018-03-22  Junio C HamanoMerge branch 'gs/test-unset-xdg-cache-home' into maint
2018-03-22  Junio C HamanoMerge branch 'sb/status-doc-fix' into maint
2018-03-22  Junio C HamanoMerge branch 'bp/fsmonitor' into maint
2018-03-22  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'...
2018-03-22  Junio C HamanoMerge branch 'sg/doc-test-must-fail-args' into maint
2018-03-22  Junio C HamanoMerge branch 'nd/ignore-glob-doc-update' into maint
2018-03-22  Junio C HamanoMerge branch 'tz/doc-show-defaults-to-head' into maint
2018-03-22  Junio C HamanoMerge branch 'jc/mailinfo-cleanup-fix' into maint
next