git.oblomov.eu Git - git/history - t/t6037-merge-ours-theirs.sh

2019-07-29	Junio C Hamano	Merge branch 'pw/add-p-recount' into maint	blob \| commitdiff \| raw
2019-07-09	Junio C Hamano	Merge branch 'pw/add-p-recount'	blob \| commitdiff \| raw
2019-03-18	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2019-02-14	Junio C Hamano	Merge branch 'jc/no-grepping-for-strerror-in-tests'	blob \| commitdiff \| raw
2019-02-05	Junio C Hamano	Merge branch 'cc/test-ref-store-typofix'	blob \| commitdiff \| raw
2019-01-29	Junio C Hamano	Merge branch 'cc/partial-clone-doc-typofix'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'hb/t0061-dot-in-path-fix'	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'nd/packobjectshook-doc-fix' into maint	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'bw/protocol-v2' into maint	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'np/log-graph-octopus-fix' into maint	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'nd/attr-pathspec-fix' into maint	blob \| commitdiff \| raw
2018-10-31	Junio C Hamano	Adjust for 2.19.x series	blob \| commitdiff \| raw
2018-10-26	Junio C Hamano	Merge branch 'np/log-graph-octopus-fix'	blob \| commitdiff \| raw
2018-10-25	Junio C Hamano	t0061: adjust to test-tool transition	blob \| commitdiff \| raw
2018-10-16	Junio C Hamano	Merge branch 'nd/packobjectshook-doc-fix'	blob \| commitdiff \| raw
2018-10-16	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw
2018-09-27	Junio C Hamano	Sync with 2.15.3	blob \| commitdiff \| raw
2018-09-24	Junio C Hamano	Merge branch 'nd/attr-pathspec-fix'	blob \| commitdiff \| raw
2018-09-24	Junio C Hamano	Merge branch 'bw/protocol-v2'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'sg/t7501-thinkofix'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'sg/t0020-conversion-fix'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'sg/t4051-fix'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'js/larger-timestamps'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'nd/cherry-pick-quit-fix'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'jh/partial-clone-doc'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'sb/pull-rebase-submodule'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'js/typofixes'	blob \| commitdiff \| raw
2018-08-17	Junio C Hamano	Merge branch 'en/t3031-title-fix'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'sb/histogram-less-memory'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'bw/protocol-v2'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'sg/fast-import-dump-refs-on-checkpoint...	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'jk/ui-color-always-to-auto'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'sg/httpd-test-unflake'	blob \| commitdiff \| raw
2018-07-24	Junio C Hamano	Merge branch 'sb/blame-color'	blob \| commitdiff \| raw
2018-07-24	Junio C Hamano	Merge branch 'jk/fetch-all-peeled-fix'	blob \| commitdiff \| raw
2018-07-24	Junio C Hamano	Merge branch 'sb/blame-color' into jk/banned-function	blob \| commitdiff \| raw
2018-07-18	Junio C Hamano	Merge branch 'js/enhanced-version-info'	blob \| commitdiff \| raw
2018-07-18	Junio C Hamano	Merge branch 'bw/protocol-v2'	blob \| commitdiff \| raw
2018-06-28	Junio C Hamano	Merge branch 'pw/add-p-recount'	blob \| commitdiff \| raw
2018-06-28	Junio C Hamano	Merge branch 'jk/fetch-all-peeled-fix'	blob \| commitdiff \| raw
2018-06-28	Junio C Hamano	Merge branch 'jh/partial-clone'	blob \| commitdiff \| raw
2018-06-28	Junio C Hamano	Merge branch 'as/safecrlf-quiet-fix'	blob \| commitdiff \| raw
2018-06-18	Junio C Hamano	Merge branch 'ks/branch-set-upstream'	blob \| commitdiff \| raw
2018-06-18	Junio C Hamano	Merge branch 'sb/blame-color'	blob \| commitdiff \| raw
2018-06-18	Junio C Hamano	Merge branch 'mw/doc-merge-enumfix'	blob \| commitdiff \| raw
2018-06-18	Junio C Hamano	Merge branch 'en/rename-directory-detection'	blob \| commitdiff \| raw
2018-06-18	Junio C Hamano	Merge branch 'km/doc-workflows-typofix'	blob \| commitdiff \| raw
2018-06-18	Junio C Hamano	Merge branch 'rd/diff-options-typofix'	blob \| commitdiff \| raw
2018-05-30	Junio C Hamano	Merge branch 'sb/grep-die-on-unreadable-index'	blob \| commitdiff \| raw
2018-05-30	Junio C Hamano	Merge branch 'sb/blame-color'	blob \| commitdiff \| raw
2018-05-30	Junio C Hamano	Merge branch 'rs/no-null-ptr-arith-in-fast-export'	blob \| commitdiff \| raw
2018-05-30	Junio C Hamano	Merge branch 'nd/repo-clear-keep-the-index'	blob \| commitdiff \| raw
2018-05-23	Junio C Hamano	Merge branch 'tb/test-apfs-utf8-normalization'	blob \| commitdiff \| raw
2018-05-22	Junio C Hamano	Sync with Git 2.15.2	blob \| commitdiff \| raw
2018-05-22	Jeff King	Merge branch 'jk/submodule-name-verify-fix' into jk...	blob \| commitdiff \| raw
2018-05-08	Junio C Hamano	Merge branch 'nd/submodule-status-fix'	blob \| commitdiff \| raw
2018-05-08	Junio C Hamano	Merge branch 'ab/git-svn-get-record-typofix'	blob \| commitdiff \| raw
2018-05-08	Junio C Hamano	Merge branch 'sg/doc-gc-quote-mismatch-fix'	blob \| commitdiff \| raw
2018-05-08	Junio C Hamano	Merge branch 'ls/checkout-encoding'	blob \| commitdiff \| raw
2018-05-08	Junio C Hamano	Merge branch 'ab/simplify-perl-makefile'	blob \| commitdiff \| raw
2018-05-08	Junio C Hamano	Merge branch 'bw/protocol-v2'	blob \| commitdiff \| raw
2018-05-02	Junio C Hamano	Merge branch 'bw/protocol-v2' into jt/partial-clone...	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'bp/fsmonitor-bufsize-fix'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'es/worktree-docs'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'es/fread-reads-dir-autoconf-fix'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'js/t5404-path-fix'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'lw/daemon-log-destination'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'mn/send-email-credential-doc'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'ak/bisect-doc-typofix'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'nd/worktree-move'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'bw/commit-partial-from-subdirectory-fix'	blob \| commitdiff \| raw
2018-04-25	Junio C Hamano	Merge branch 'jk/flockfile-stdio'	blob \| commitdiff \| raw
2018-04-24	Junio C Hamano	Merge branch 'bw/protocol-v2' into HEAD	blob \| commitdiff \| raw
2018-04-10	Junio C Hamano	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| commitdiff \| raw
2018-04-10	Junio C Hamano	Merge branch 'nd/trace-with-env'	blob \| commitdiff \| raw
2018-04-10	Junio C Hamano	Merge branch 'jk/diff-highlight-graph-fix'	blob \| commitdiff \| raw
2018-04-09	Junio C Hamano	Merge branch 'tg/stash-untracked-with-pathspec-fix'	blob \| commitdiff \| raw
2018-04-09	Junio C Hamano	Merge branch 'en/rename-directory-detection'	blob \| commitdiff \| raw
2018-03-29	Junio C Hamano	Merge branch 'jh/partial-clone'	blob \| commitdiff \| raw
2018-03-28	Junio C Hamano	Merge branch 'pc/submodule-helper'	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'sm/mv-dry-run-update' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'tg/worktree-create-tracking' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'gs/test-unset-xdg-cache-home' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'sb/status-doc-fix' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'rd/typofix' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'bp/fsmonitor' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'bc/doc-interpret-trailers-grammofix'...	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'sg/doc-test-must-fail-args' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'rj/sparse-updates' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'jk/gettext-poison' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'nd/ignore-glob-doc-update' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'rs/cocci-strbuf-addf-to-addstr' into...	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'jc/worktree-add-short-help' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'tz/doc-show-defaults-to-head' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'nd/shared-index-fix' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'jc/mailinfo-cleanup-fix' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'rb/hashmap-h-compilation-fix' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'rs/describe-unique-abbrev' into maint	blob \| commitdiff \| raw
2018-03-22	Junio C Hamano	Merge branch 'ks/submodule-doc-updates' into maint	blob \| commitdiff \| raw
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom