git.oblomov.eu Git - git/history - t/t3309-notes-merge-auto-resolve.sh

[git] / t / t3309-notes-merge-auto-resolve.sh

2015-10-05	Junio C Hamano	Merge branch 'jk/date-local'	blob \| commitdiff \| raw
2015-10-05	Junio C Hamano	Merge branch 'dt/refs-bisection'	blob \| commitdiff \| raw
2015-10-05	Junio C Hamano	Merge branch 'nk/stash-show-config'	blob \| commitdiff \| raw
2015-10-05	Junio C Hamano	Merge branch 'jk/async-pkt-line'	blob \| commitdiff \| raw
2015-10-05	Junio C Hamano	Merge branch 'jh/quiltimport-explicit-series-file'	blob \| commitdiff \| raw
2015-10-05	Junio C Hamano	Merge branch 'ld/p4-import-labels'	blob \| commitdiff \| raw
2015-10-05	Junio C Hamano	Merge branch 'ad/bisect-terms'	blob \| commitdiff \| raw
2015-10-05	Junio C Hamano	Merge branch 'jc/rerere'	blob \| commitdiff \| raw
2015-10-05	Junio C Hamano	Merge branch 'kn/for-each-tag-branch'	blob \| commitdiff \| raw
2015-09-21	Junio C Hamano	Merge branch 'bn/send-email-smtp-auth-error-message...	blob \| commitdiff \| raw
2015-09-17	Junio C Hamano	Sync with 2.5.3	blob \| commitdiff \| raw
2015-09-17	Junio C Hamano	Merge branch 'po/doc-branch-desc'	blob \| commitdiff \| raw
2015-09-17	Junio C Hamano	Merge branch 'as/config-doc-markup-fix'	blob \| commitdiff \| raw
2015-09-14	Junio C Hamano	Merge branch 'js/maint-am-skip-performance-regression'	blob \| commitdiff \| raw
2015-09-14	Junio C Hamano	Merge branch 'ah/show-ref-usage-string'	blob \| commitdiff \| raw
2015-09-14	Junio C Hamano	Merge branch 'sg/help-group'	blob \| commitdiff \| raw
2015-09-14	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2015-09-14	Junio C Hamano	Merge branch 'mp/t7060-diff-index-test'	blob \| commitdiff \| raw
2015-09-14	Junio C Hamano	Merge branch 'gb/apply-comment-typofix'	blob \| commitdiff \| raw
2015-09-09	Junio C Hamano	Sync with 2.5.2	blob \| commitdiff \| raw
2015-09-08	Junio C Hamano	Merge branch 'jc/builtin-am-signoff-regression-fix'	blob \| commitdiff \| raw
2015-09-05	Jiang Xin	Merge branch 'master' of github.com:jiangxin/git into...	blob \| commitdiff \| raw
2015-09-04	Junio C Hamano	Sync with maint	blob \| commitdiff \| raw
2015-09-04	Junio C Hamano	Merge branch 'sg/t3020-typofix' into maint	blob \| commitdiff \| raw \| diff to current
2015-09-02	Junio C Hamano	Merge branch 'cc/trailers-corner-case-fix'	blob \| commitdiff \| raw
2015-09-02	Junio C Hamano	Merge branch 'sb/read-cache-one-indent-style-fix'	blob \| commitdiff \| raw
2015-09-02	Junio C Hamano	Merge branch 'ee/clean-test-fixes'	blob \| commitdiff \| raw
2015-09-02	Junio C Hamano	Merge branch 'jk/log-missing-default-HEAD'	blob \| commitdiff \| raw
2015-09-01	Junio C Hamano	Merge branch 'dt/commit-preserve-base-index-upon-opport...	blob \| commitdiff \| raw
2015-09-01	Junio C Hamano	Merge branch 'rt/remove-hold-lockfile-for-append'	blob \| commitdiff \| raw
2015-09-01	Junio C Hamano	Merge branch 'rs/archive-zip-many'	blob \| commitdiff \| raw
2015-09-01	Junio C Hamano	Merge branch 'ls/p4-fold-case-client-specs'	blob \| commitdiff \| raw
2015-09-01	Junio C Hamano	Merge branch 'ah/submodule-typofix-in-error'	blob \| commitdiff \| raw
2015-09-01	Junio C Hamano	Merge branch 'ah/reflog-typofix-in-error'	blob \| commitdiff \| raw
2015-09-01	Junio C Hamano	Merge branch 'ah/read-tree-usage-string'	blob \| commitdiff \| raw
2015-09-01	Junio C Hamano	Merge branch 'ah/pack-objects-usage-strings'	blob \| commitdiff \| raw
2015-09-01	Junio C Hamano	Merge branch 'br/svn-doc-include-paths-config'	blob \| commitdiff \| raw
2015-09-01	Junio C Hamano	Merge branch 'nd/fixup-linked-gitdir'	blob \| commitdiff \| raw
2015-08-31	Junio C Hamano	Merge branch 'sg/describe-contains'	blob \| commitdiff \| raw
2015-08-31	Junio C Hamano	Merge branch 'db/push-sign-if-asked'	blob \| commitdiff \| raw
2015-08-31	Junio C Hamano	Merge branch 'jk/notes-merge-config'	blob \| commitdiff \| raw
2015-08-26	Junio C Hamano	Merge branch 'sg/t3020-typofix'	blob \| commitdiff \| raw \| diff to current
2015-08-17	Jacob Keller	notes: teach git-notes about notes.<name>.mergeStrategy...	blob \| commitdiff \| raw
2015-08-17	Jacob Keller	notes: add notes.mergeStrategy option to select default...	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-30	Junio C Hamano	Merge branch 'sb/merge-recursive-copy-paste-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-10-14	Jonathan Nieder	Merge branch 'rj/highlight-test-hang'	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
2013-01-08	Junio C Hamano	Merge branch 'ta/remove-stale-translated-tut'	blob \| commitdiff \| raw \| diff to current
2012-10-17	Junio C Hamano	Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2012-10-08	Junio C Hamano	Merge branch 'os/commit-submodule-ignore' into maint	blob \| commitdiff \| raw \| diff to current
2012-10-01	Junio C Hamano	Merge branch 'os/commit-submodule-ignore'	blob \| commitdiff \| raw \| diff to current
2012-09-15	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents' into maint...	blob \| commitdiff \| raw \| diff to current
2012-09-12	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2012-09-12	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents'	blob \| commitdiff \| raw \| diff to current
2012-08-24	Junio C Hamano	Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'jn/block-sha1' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'ms/daemon-doc-typo' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'lm/git-blame-el' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-24	Junio C Hamano	Merge branch 'jn/block-sha1'	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'...	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom