Merge branch 'sb/submodule-url-to-absolute'
[gitweb.git] / t / t6037-merge-ours-theirs.sh
2018-10-26 Merge branch 'np/log-graph-octopus-fix'
2018-10-25 t0061: adjust to test-tool transition
2018-10-16 Merge branch 'nd/packobjectshook-doc-fix'
2018-10-16 Merge branch 'jk/check-everything-connected-is-long...
2018-09-27 Sync with 2.15.3
2018-09-24 Merge branch 'nd/attr-pathspec-fix'
2018-09-24 Merge branch 'bw/protocol-v2'
2018-08-27 Merge branch 'sg/t7501-thinkofix'
2018-08-27 Merge branch 'sg/t0020-conversion-fix'
2018-08-27 Merge branch 'sg/t4051-fix'
2018-08-27 Merge branch 'js/larger-timestamps'
2018-08-20 Merge branch 'nd/cherry-pick-quit-fix'
2018-08-20 Merge branch 'jh/partial-clone-doc'
2018-08-20 Merge branch 'sb/pull-rebase-submodule'
2018-08-20 Merge branch 'js/typofixes'
2018-08-17 Merge branch 'en/t3031-title-fix'
2018-08-15 Merge branch 'sb/histogram-less-memory'
2018-08-15 Merge branch 'bw/protocol-v2'
2018-08-15 Merge branch 'sg/fast-import-dump-refs-on-checkpoint...
2018-08-15 Merge branch 'jk/ui-color-always-to-auto'
2018-08-02 Merge branch 'sg/httpd-test-unflake'
2018-07-24 Merge branch 'sb/blame-color'
2018-07-24 Merge branch 'jk/fetch-all-peeled-fix'
2018-07-24 Merge branch 'sb/blame-color' into jk/banned-function
2018-07-18 Merge branch 'js/enhanced-version-info'
2018-07-18 Merge branch 'bw/protocol-v2'
2018-06-28 Merge branch 'pw/add-p-recount'
2018-06-28 Merge branch 'jk/fetch-all-peeled-fix'
2018-06-28 Merge branch 'jh/partial-clone'
2018-06-28 Merge branch 'as/safecrlf-quiet-fix'
2018-06-18 Merge branch 'ks/branch-set-upstream'
2018-06-18 Merge branch 'sb/blame-color'
2018-06-18 Merge branch 'mw/doc-merge-enumfix'
2018-06-18 Merge branch 'en/rename-directory-detection'
2018-06-18 Merge branch 'km/doc-workflows-typofix'
2018-06-18 Merge branch 'rd/diff-options-typofix'
2018-05-30 Merge branch 'sb/grep-die-on-unreadable-index'
2018-05-30 Merge branch 'sb/blame-color'
2018-05-30 Merge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-30 Merge branch 'nd/repo-clear-keep-the-index'
2018-05-23 Merge branch 'tb/test-apfs-utf8-normalization'
2018-05-22 Sync with Git 2.15.2
2018-05-22 Merge branch 'jk/submodule-name-verify-fix' into jk...
2018-05-08 Merge branch 'nd/submodule-status-fix'
2018-05-08 Merge branch 'ab/git-svn-get-record-typofix'
2018-05-08 Merge branch 'sg/doc-gc-quote-mismatch-fix'
2018-05-08 Merge branch 'ls/checkout-encoding'
2018-05-08 Merge branch 'ab/simplify-perl-makefile'
2018-05-08 Merge branch 'bw/protocol-v2'
2018-05-02 Merge branch 'bw/protocol-v2' into jt/partial-clone...
2018-04-25 Merge branch 'bp/fsmonitor-bufsize-fix'
2018-04-25 Merge branch 'es/worktree-docs'
2018-04-25 Merge branch 'es/fread-reads-dir-autoconf-fix'
2018-04-25 Merge branch 'js/t5404-path-fix'
2018-04-25 Merge branch 'lw/daemon-log-destination'
2018-04-25 Merge branch 'mn/send-email-credential-doc'
2018-04-25 Merge branch 'ak/bisect-doc-typofix'
2018-04-25 Merge branch 'nd/worktree-move'
2018-04-25 Merge branch 'bw/commit-partial-from-subdirectory-fix'
2018-04-25 Merge branch 'jk/flockfile-stdio'
2018-04-24 Merge branch 'bw/protocol-v2' into HEAD
2018-04-10 Merge branch 'ys/bisect-object-id-missing-conversion...
2018-04-10 Merge branch 'nd/trace-with-env'
2018-04-10 Merge branch 'jk/diff-highlight-graph-fix'
2018-04-09 Merge branch 'tg/stash-untracked-with-pathspec-fix'
2018-04-09 Merge branch 'en/rename-directory-detection'
2018-03-29 Merge branch 'jh/partial-clone'
2018-03-28 Merge branch 'pc/submodule-helper'
2018-03-22 Merge branch 'sm/mv-dry-run-update' into maint
2018-03-22 Merge branch 'tg/worktree-create-tracking' into maint
2018-03-22 Merge branch 'gs/test-unset-xdg-cache-home' into maint
2018-03-22 Merge branch 'sb/status-doc-fix' into maint
2018-03-22 Merge branch 'rd/typofix' into maint
2018-03-22 Merge branch 'bp/fsmonitor' into maint
2018-03-22 Merge branch 'bc/doc-interpret-trailers-grammofix'...
2018-03-22 Merge branch 'sg/doc-test-must-fail-args' into maint
2018-03-22 Merge branch 'rj/sparse-updates' into maint
2018-03-22 Merge branch 'jk/gettext-poison' into maint
2018-03-22 Merge branch 'nd/ignore-glob-doc-update' into maint
2018-03-22 Merge branch 'rs/cocci-strbuf-addf-to-addstr' into...
2018-03-22 Merge branch 'jc/worktree-add-short-help' into maint
2018-03-22 Merge branch 'tz/doc-show-defaults-to-head' into maint
2018-03-22 Merge branch 'nd/shared-index-fix' into maint
2018-03-22 Merge branch 'jc/mailinfo-cleanup-fix' into maint
2018-03-22 Merge branch 'rb/hashmap-h-compilation-fix' into maint
2018-03-22 Merge branch 'rs/describe-unique-abbrev' into maint
2018-03-22 Merge branch 'ks/submodule-doc-updates' into maint
2018-03-22 Merge branch 'cl/t9001-cleanup' into maint
2018-03-22 Merge branch 'bw/oidmap-autoinit' into maint
2018-03-22 Merge branch 'sg/test-i18ngrep' into maint
2018-03-22 Merge branch 'jt/fsck-code-cleanup' into maint
2018-03-22 Merge branch 'ew/svn-branch-segfault-fix' into maint
2018-03-22 Merge branch 'nd/list-merge-strategy' into maint
2018-03-22 Merge branch 'jk/daemon-fixes' into maint
2018-03-22 Merge branch 'tg/split-index-fixes' into maint
2018-03-22 Merge branch 'mr/packed-ref-store-fix' into maint
2018-03-22 Merge branch 'jt/http-redact-cookies' into maint
2018-03-22 Merge branch 'nd/diff-flush-before-warning' into maint
2018-03-22 Merge branch 'sg/travis-build-during-script-phase'...
2018-03-21 Merge branch 'ml/filter-branch-portability-fix'
next