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

2014-05-19	Junio C Hamano	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| commitdiff \| raw
2014-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2014-01-21	Junio C Hamano	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| commitdiff \| raw
2014-01-14	Junio C Hamano	Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...	blob \| commitdiff \| raw
2013-12-09	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2013-12-09	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2013-11-07	Junio C Hamano	Merge branch 'vd/doc-unpack-objects' into maint	blob \| commitdiff \| raw
2013-11-04	Junio C Hamano	Merge branch 'vd/doc-unpack-objects'	blob \| commitdiff \| raw
2013-10-30	Junio C Hamano	Merge branch 'jk/refs-c-squelch-gcc'	blob \| commitdiff \| raw
2013-10-30	Junio C Hamano	Merge branch 'jk/date-c-double-semicolon'	blob \| commitdiff \| raw
2013-06-17	Junio C Hamano	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2013-05-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2013-05-13	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2013-03-28	Junio C Hamano	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| commitdiff \| raw
2013-02-04	Junio C Hamano	Merge branch 'dl/am-hg-locale' into maint	blob \| commitdiff \| raw
2013-01-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2013-01-28	Junio C Hamano	Merge branch 'dl/am-hg-locale'	blob \| commitdiff \| raw
2013-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2013-01-14	Junio C Hamano	Merge branch 'jk/shortlog-no-wrap-doc' into maint	blob \| commitdiff \| raw
2013-01-12	Junio C Hamano	Merge branch 'jk/shortlog-no-wrap-doc'	blob \| commitdiff \| raw
2013-01-10	Junio C Hamano	Merge branch 'ta/remove-stale-translated-tut' into...	blob \| commitdiff \| raw
2013-01-08	Junio C Hamano	Merge branch 'ta/remove-stale-translated-tut'	blob \| commitdiff \| raw
2012-10-17	Junio C Hamano	Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2012-09-15	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents' into maint...	blob \| commitdiff \| raw
2012-09-12	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2012-09-12	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents'	blob \| commitdiff \| raw
2012-08-24	Junio C Hamano	Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11	blob \| commitdiff \| raw
2012-08-06	Junio C Hamano	Merge branch 'jn/block-sha1' into maint	blob \| commitdiff \| raw
2012-08-06	Junio C Hamano	Merge branch 'ms/daemon-doc-typo' into maint	blob \| commitdiff \| raw
2012-07-24	Junio C Hamano	Merge branch 'jn/block-sha1'	blob \| commitdiff \| raw
2012-07-22	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'...	blob \| commitdiff \| raw
2012-07-22	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare' into maint	blob \| commitdiff \| raw
2012-07-22	Junio C Hamano	Merge branch 'ms/daemon-doc-typo'	blob \| commitdiff \| raw
2012-07-16	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare'	blob \| commitdiff \| raw
2012-07-16	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'	blob \| commitdiff \| raw
2012-07-11	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare' into tg...	blob \| commitdiff \| raw
2012-06-25	Junio C Hamano	Merge branch 'lp/no-cmd-http-fetch'	blob \| commitdiff \| raw
2012-06-17	Junio C Hamano	Merge branch 'js/maint-fast-export-mark-error' into...	blob \| commitdiff \| raw
2012-06-12	Junio C Hamano	Merge branch 'js/maint-fast-export-mark-error'	blob \| commitdiff \| raw
2012-04-26	Junio C Hamano	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| commitdiff \| raw
2012-04-16	Junio C Hamano	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| commitdiff \| raw
2012-04-10	David A. Greene	Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...	blob \| commitdiff \| raw
2012-04-02	Junio C Hamano	Merge branch 'pt/gitk'	blob \| commitdiff \| raw
2012-03-24	Junio C Hamano	Merge gitk changes from Paul Mackerras at git://ozlabs...	blob \| commitdiff \| raw
2012-03-16	Junio C Hamano	Merge branch 'th/doc-diff-submodule-option'	blob \| commitdiff \| raw
2011-12-21	Junio C Hamano	Merge branch 'jl/submodule-status-failure-report' into...	blob \| commitdiff \| raw
2011-12-21	Junio C Hamano	Merge branch 'ms/commit-cc-option-helpstring' into...	blob \| commitdiff \| raw
2011-12-18	Junio C Hamano	Update jk/maint-strbuf-missing-init to builtin/ rename	blob \| commitdiff \| raw
2011-12-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'jl/submodule-status-failure-report'	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'jc/maint-name-rev-all' into maint-1.7.6	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'ml/mailmap' into maint-1.7.6	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2011-11-23	Junio C Hamano	Merge branch 'maint' into tj/imap-send-remove-unused	blob \| commitdiff \| raw
2011-11-21	Junio C Hamano	Merge branch 'jk/maint-1.6.2-upload-archive' into jk...	blob \| commitdiff \| raw
2011-11-18	Junio C Hamano	Merge branch 'jc/maint-name-rev-all' into maint	blob \| commitdiff \| raw
2011-11-18	Junio C Hamano	Merge branch 'ml/mailmap' into maint	blob \| commitdiff \| raw
2011-11-10	Junio C Hamano	Merge "Move 'builtin-*' into a 'builtin/' subdirectory"	blob \| commitdiff \| raw
2011-11-09	Junio C Hamano	Merge branch 'fc/remote-seturl-usage-fix'	blob \| commitdiff \| raw
2011-11-09	Junio C Hamano	Merge branch 'jc/maint-remove-renamed-ref' into maint	blob \| commitdiff \| raw
2011-10-26	Junio C Hamano	Merge branch 'sn/doc-update-index-assume-unchanged...	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'jc/maint-remove-renamed-ref'	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'jc/apply-blank-at-eof-fix' into maint	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'js/maint-merge-one-file-osx-expr' into...	blob \| commitdiff \| raw
2011-10-19	Junio C Hamano	Merge branch 'js/log-show-children'	blob \| commitdiff \| raw
2011-10-19	Junio C Hamano	Merge branch 'cb/httpd-test-fix-port'	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'nm/grep-object-sha1-lock' into maint	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'jc/maint-grep-untracked-exclude' into...	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'js/maint-merge-one-file-osx-expr'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'jc/apply-blank-at-eof-fix'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'bw/grep-no-index-no-exclude'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'sn/doc-update-index-assume-unchanged'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'rj/quietly-create-dep-dir'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'gb/am-hg-patch'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'nm/grep-object-sha1-lock'	blob \| commitdiff \| raw
2011-10-05	Junio C Hamano	Merge branch 'jc/maint-grep-untracked-exclude' into...	blob \| commitdiff \| raw
2011-09-23	Junio C Hamano	Merge branch 'gb/maint-am-patch-format-error-message...	blob \| commitdiff \| raw
2011-09-02	Junio C Hamano	Merge branch 'gb/maint-am-stgit-author-to-from-fix'	blob \| commitdiff \| raw
2011-09-02	Junio C Hamano	Merge branch 'gb/maint-am-patch-format-error-message'	blob \| commitdiff \| raw
2011-08-16	Junio C Hamano	Merge branch 'bw/log-all-ref-updates-doc' into maint	blob \| commitdiff \| raw
2011-08-16	Junio C Hamano	Merge branch 'js/maint-add-path-stat-pwd' into maint	blob \| commitdiff \| raw
2011-08-16	Junio C Hamano	Merge branch 'jn/mime-type-with-params' into maint	blob \| commitdiff \| raw
2011-07-22	Junio C Hamano	Merge branch 'bw/log-all-ref-updates-doc'	blob \| commitdiff \| raw
2011-07-22	Junio C Hamano	Merge branch 'js/maint-add-path-stat-pwd'	blob \| commitdiff \| raw
2011-07-19	Junio C Hamano	Merge branch 'jn/mime-type-with-params'	blob \| commitdiff \| raw
2011-07-06	Junio C Hamano	Merge commit 'v1.7.6' into jc/checkout-reflog-fix	blob \| commitdiff \| raw
2011-06-06	Junio C Hamano	Merge branch 'jn/mime-type-with-params'	blob \| commitdiff \| raw
2011-06-06	Junio C Hamano	Merge branch 'jk/diff-not-so-quick'	blob \| commitdiff \| raw
2011-06-06	Junio C Hamano	Merge branch 'bc/maint-status-z-to-use-porcelain'	blob \| commitdiff \| raw
2011-05-31	Junio C Hamano	Merge remote-tracking branch 'ko/maint' into jc/diff...	blob \| commitdiff \| raw
2011-05-26	Junio C Hamano	Merge branch 'rg/no-gecos-in-pwent'	blob \| commitdiff \| raw
2011-05-26	Junio C Hamano	Merge branch 'jk/git-connection-deadlock-fix' into...	blob \| commitdiff \| raw
2011-05-26	Junio C Hamano	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	blob \| commitdiff \| raw
2011-05-26	Junio C Hamano	Merge branch 'rg/copy-gecos-username' into maint	blob \| commitdiff \| raw
2011-05-26	Junio C Hamano	Merge branch 'jk/git-connection-deadlock-fix' into...	blob \| commitdiff \| raw
2011-05-26	Junio C Hamano	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	blob \| commitdiff \| raw
2011-05-20	Junio C Hamano	Merge branch 'rg/copy-gecos-username'	blob \| commitdiff \| raw
2011-05-20	Junio C Hamano	Merge branch 'jk/git-connection-deadlock-fix'	blob \| commitdiff \| raw
2011-05-20	Junio C Hamano	Merge branch 'js/maint-send-pack-stateless-rpc-deadlock...	blob \| commitdiff \| raw
next

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

RSS Atom