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