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

2017-11-09	Junio C Hamano	Merge branch 'js/mingw-full-version-in-resources'	blob \| commitdiff \| raw
2017-11-09	Junio C Hamano	Merge branch 'dk/libsecret-unlock-to-load-fix'	blob \| commitdiff \| raw
2017-11-09	Junio C Hamano	Merge branch 'ks/mailmap'	blob \| commitdiff \| raw
2017-11-09	Junio C Hamano	Merge branch 'js/early-config'	blob \| commitdiff \| raw
2017-11-09	Junio C Hamano	Merge branch 'sg/travis-fixes'	blob \| commitdiff \| raw
2017-11-09	Junio C Hamano	Merge branch 'bw/diff-opt-impl-to-bitfields'	blob \| commitdiff \| raw
2017-11-09	Junio C Hamano	Merge branch 'rs/hex-to-bytes-cleanup'	blob \| commitdiff \| raw \| diff to current
2017-11-09	Junio C Hamano	Merge branch 'ad/5580-unc-tests-on-cygwin'	blob \| commitdiff \| raw \| diff to current
2017-11-09	Junio C Hamano	Merge branch 'ao/diff-populate-filespec-lstat-errorpath...	blob \| commitdiff \| raw \| diff to current
2017-11-09	Junio C Hamano	Merge branch 'sb/blame-config-doc'	blob \| commitdiff \| raw \| diff to current
2017-11-09	Junio C Hamano	Merge branch 'jm/relnotes-2.15-typofix'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'tg/deprecate-stash-save'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'tb/complete-checkout'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'gc/gitweb-filetest-acl'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'mp/push-pushoption-config'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'hv/fetch-moved-submodules-on-demand'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'jc/check-ref-format-oor'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'jc/t5601-copy-workaround'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'bc/object-id'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'jk/revision-pruning-optim'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'ds/find-unique-abbrev-optim'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'wk/pull-signoff'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'pc/submodule-helper'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'pb/bisect-helper'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'dm/run-command-ignored-hook-advise'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'ex/deprecate-empty-pathspec-as-match...	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'jk/rebase-i-exec-gitdir-fix'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'cn/diff-indent-no-longer-is-experimental'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'bw/grep-recurse-submodules'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'mh/test-local-canary'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'js/submodule-in-excluded'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'ao/check-resolve-ref-unsafe-result'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'jk/misc-resolve-ref-unsafe-fixes'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'sb/diff-color-moved-use-xdl-recmatch'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'jk/diff-color-moved-fix'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'kd/auto-col-with-pager-fix'	blob \| commitdiff \| raw \| diff to current
2017-11-06	Junio C Hamano	Merge branch 'jc/no-cmd-as-subroutine'	blob \| commitdiff \| raw \| diff to current
2017-10-11	Junio C Hamano	merge-ours: do not use cmd_*() as a subroutine	blob \| commitdiff \| raw \| diff to current
2017-07-25	Junio C Hamano	Merge branch 'js/msgfmt-on-windows' of ../git-gui into...	blob \| commitdiff \| raw \| diff to current
2017-04-17	Junio C Hamano	Merge branch 'jc/bs-t-is-not-a-tab-for-sed'	blob \| commitdiff \| raw \| diff to current
2017-01-18	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2016-10-20	Junio C Hamano	Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'va/i18n' of ../git-gui into va/git-gui...	blob \| commitdiff \| raw \| diff to current
2016-09-26	Junio C Hamano	Merge branch 'rs/use-modern-git-merge-syntax' of git...	blob \| commitdiff \| raw \| diff to current
2016-09-11	Junio C Hamano	Merge branch 'js/commit-gpgsign' of ../git-gui into...	blob \| commitdiff \| raw \| diff to current
2016-09-09	Junio C Hamano	Merge branch 'ls/packet-line-protocol-doc-fix' into...	blob \| commitdiff \| raw \| diff to current
2016-09-07	Junio C Hamano	Merge branch 'sy/i18n' of git-gui	blob \| commitdiff \| raw \| diff to current
2016-08-31	Junio C Hamano	Merge branch 'ls/packet-line-protocol-doc-fix'	blob \| commitdiff \| raw \| diff to current
2016-05-26	Junio C Hamano	Merge branch 'va/mailinfo-doc-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2016-05-17	Junio C Hamano	Merge branch 'va/mailinfo-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2016-03-21	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-12-21	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-10-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-10-16	Junio C Hamano	Merge branch 'jk/make-findstring-makeflags-fix' into...	blob \| commitdiff \| raw \| diff to current
2015-10-05	Junio C Hamano	Merge branch 'jk/make-findstring-makeflags-fix'	blob \| commitdiff \| raw \| diff to current
2015-09-14	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-09-14	Junio C Hamano	Merge branch 'gb/apply-comment-typofix'	blob \| commitdiff \| raw \| diff to current
2015-09-04	Junio C Hamano	Merge branch 'sg/t3020-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2015-08-26	Junio C Hamano	Merge branch 'sg/t3020-typofix'	blob \| commitdiff \| raw \| diff to current
2015-06-16	Junio C Hamano	Merge branch 'mc/commit-doc-grammofix' into maint	blob \| commitdiff \| raw \| diff to current
2015-06-01	Junio C Hamano	Merge branch 'mc/commit-doc-grammofix'	blob \| commitdiff \| raw \| diff to current
2015-05-26	Junio C Hamano	Merge branch 'sg/complete-decorate-full-not-long' into...	blob \| commitdiff \| raw \| diff to current
2015-05-11	Junio C Hamano	Merge branch 'sg/complete-decorate-full-not-long'	blob \| commitdiff \| raw \| diff to current
2015-04-19	Junio C Hamano	Merge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| raw \| diff to current
2015-03-24	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2015-03-05	Junio C Hamano	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'sb/hex-object-name-is-at-most-41-bytes...	blob \| commitdiff \| raw \| diff to current
2015-02-25	Junio C Hamano	Merge branch 'jk/remote-curl-an-array-in-struct-cannot...	blob \| commitdiff \| raw \| diff to current
2015-02-17	Junio C Hamano	Merge branch 'jk/remote-curl-an-array-in-struct-cannot...	blob \| commitdiff \| raw \| diff to current
2015-01-12	Junio C Hamano	Merge branch 'rw/apply-does-not-take-ignore-date' into...	blob \| commitdiff \| raw \| diff to current
2014-12-22	Junio C Hamano	Merge branch 'rw/apply-does-not-take-ignore-date'	blob \| commitdiff \| raw \| diff to current
2014-10-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-10-29	Junio C Hamano	Merge branch 'bc/asciidoc-pretty-formats-fix' into...	blob \| commitdiff \| raw \| diff to current
2014-10-14	Junio C Hamano	Merge branch 'bc/asciidoc-pretty-formats-fix'	blob \| commitdiff \| raw \| diff to current
2014-09-26	Junio C Hamano	Merge branch 'sb/help-unknown-command-sort-fix'	blob \| commitdiff \| raw \| diff to current
2014-08-10	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-06-27	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-06-26	Junio C Hamano	Merge early parts from git://ozlabs.org/~paulus/gitk.git	blob \| commitdiff \| raw \| diff to current
2014-06-26	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2014-05-19	Junio C Hamano	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| commitdiff \| raw \| diff to current
2014-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-01-21	Junio C Hamano	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| raw \| diff to current
2014-01-14	Junio C Hamano	Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...	blob \| commitdiff \| raw \| diff to current
2013-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2013-12-09	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-11-07	Junio C Hamano	Merge branch 'vd/doc-unpack-objects' into maint	blob \| commitdiff \| raw \| diff to current
2013-11-04	Junio C Hamano	Merge branch 'vd/doc-unpack-objects'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'jk/refs-c-squelch-gcc'	blob \| commitdiff \| raw \| diff to current
2013-10-30	Junio C Hamano	Merge branch 'jk/date-c-double-semicolon'	blob \| commitdiff \| raw \| diff to current
2013-06-17	Junio C Hamano	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2013-05-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-05-13	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-03-28	Junio C Hamano	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'dl/am-hg-locale' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'dl/am-hg-locale'	blob \| commitdiff \| raw \| diff to current
2013-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jk/shortlog-no-wrap-doc' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-12	Junio C Hamano	Merge branch 'jk/shortlog-no-wrap-doc'	blob \| commitdiff \| raw \| diff to current
2013-01-10	Junio C Hamano	Merge branch 'ta/remove-stale-translated-tut' into...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom