git.oblomov.eu Git - git/history - builtin/merge-ours.c

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

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

RSS Atom