Merge branch 'jk/date-local'
[git] / t / t3309-notes-merge-auto-resolve.sh
2015-10-05  Junio C HamanoMerge branch 'jk/date-local'
2015-10-05  Junio C HamanoMerge branch 'dt/refs-bisection'
2015-10-05  Junio C HamanoMerge branch 'nk/stash-show-config'
2015-10-05  Junio C HamanoMerge branch 'jk/async-pkt-line'
2015-10-05  Junio C HamanoMerge branch 'jh/quiltimport-explicit-series-file'
2015-10-05  Junio C HamanoMerge branch 'ld/p4-import-labels'
2015-10-05  Junio C HamanoMerge branch 'ad/bisect-terms'
2015-10-05  Junio C HamanoMerge branch 'jc/rerere'
2015-10-05  Junio C HamanoMerge branch 'kn/for-each-tag-branch'
2015-09-21  Junio C HamanoMerge branch 'bn/send-email-smtp-auth-error-message...
2015-09-17  Junio C HamanoSync with 2.5.3
2015-09-17  Junio C HamanoMerge branch 'po/doc-branch-desc'
2015-09-17  Junio C HamanoMerge branch 'as/config-doc-markup-fix'
2015-09-14  Junio C HamanoMerge branch 'js/maint-am-skip-performance-regression'
2015-09-14  Junio C HamanoMerge branch 'ah/show-ref-usage-string'
2015-09-14  Junio C HamanoMerge branch 'sg/help-group'
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test'
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix'
2015-09-09  Junio C HamanoSync with 2.5.2
2015-09-08  Junio C HamanoMerge branch 'jc/builtin-am-signoff-regression-fix'
2015-09-05  Jiang XinMerge branch 'master' of github.com:jiangxin/git into...
2015-09-04  Junio C HamanoSync with maint
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint
2015-09-02  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix'
2015-09-02  Junio C HamanoMerge branch 'sb/read-cache-one-indent-style-fix'
2015-09-02  Junio C HamanoMerge branch 'ee/clean-test-fixes'
2015-09-02  Junio C HamanoMerge branch 'jk/log-missing-default-HEAD'
2015-09-01  Junio C HamanoMerge branch 'dt/commit-preserve-base-index-upon-opport...
2015-09-01  Junio C HamanoMerge branch 'rt/remove-hold-lockfile-for-append'
2015-09-01  Junio C HamanoMerge branch 'rs/archive-zip-many'
2015-09-01  Junio C HamanoMerge branch 'ls/p4-fold-case-client-specs'
2015-09-01  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error'
2015-09-01  Junio C HamanoMerge branch 'ah/reflog-typofix-in-error'
2015-09-01  Junio C HamanoMerge branch 'ah/read-tree-usage-string'
2015-09-01  Junio C HamanoMerge branch 'ah/pack-objects-usage-strings'
2015-09-01  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config'
2015-09-01  Junio C HamanoMerge branch 'nd/fixup-linked-gitdir'
2015-08-31  Junio C HamanoMerge branch 'sg/describe-contains'
2015-08-31  Junio C HamanoMerge branch 'db/push-sign-if-asked'
2015-08-31  Junio C HamanoMerge branch 'jk/notes-merge-config'
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix'
2015-08-17  Jacob Kellernotes: teach git-notes about notes.<name>.mergeStrategy...
2015-08-17  Jacob Kellernotes: add notes.mergeStrategy option to select default...
2015-06-16  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' into maint
2015-06-01  Junio C HamanoMerge branch 'mc/commit-doc-grammofix'
2015-05-26  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long' into...
2015-05-11  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long'
2015-04-19  Junio C HamanoMerge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui
2015-03-24  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2015-03-05  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes...
2015-02-25  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-02-17  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot...
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into...
2014-12-22  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date'
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui
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-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang'
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-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint
2012-10-01  Junio C HamanoMerge branch 'os/commit-submodule-ignore'
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-08-06  Junio C HamanoMerge branch 'lm/git-blame-el' 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'...
next