projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'sb/http-flaky-test-fix' into maint
[git] / t / t3309-notes-merge-auto-resolve.sh
2015-10-16  Junio C HamanoMerge branch 'sb/http-flaky-test-fix' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'sb/perf-without-installed-git' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'js/icase-wt-detection' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'pt/am-builtin' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'mm/detach-at-HEAD-reflog' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'gr/rebase-i-drop-warn' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'dt/log-follow-config' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'ti/glibc-stdio-mutex-from-signal-handler... blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jk/notes-dwim-doc' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jk/make-findstring-makeflags-fix' into... blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jw/make-arflags-customizable' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jk/connect-clear-env' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'jk/blame-first-parent' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'mm/keyid-docs' into maint blob | commitdiff | raw
2015-10-16  Junio C HamanoMerge branch 'pt/pull-builtin' into maint blob | commitdiff | raw
2015-09-29  Junio C HamanoSync with v2.5.4 blob | commitdiff | raw
2015-09-21  Junio C HamanoMerge branch 'bn/send-email-smtp-auth-error-message... blob | commitdiff | raw
2015-09-17  Junio C HamanoSync with 2.5.3 blob | commitdiff | raw
2015-09-17  Junio C HamanoMerge branch 'po/doc-branch-desc' blob | commitdiff | raw
2015-09-17  Junio C HamanoMerge branch 'as/config-doc-markup-fix' blob | commitdiff | raw
2015-09-14  Junio C HamanoMerge branch 'js/maint-am-skip-performance-regression' blob | commitdiff | raw
2015-09-14  Junio C HamanoMerge branch 'ah/show-ref-usage-string' blob | commitdiff | raw
2015-09-14  Junio C HamanoMerge branch 'sg/help-group' blob | commitdiff | raw
2015-09-14  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw
2015-09-14  Junio C HamanoMerge branch 'mp/t7060-diff-index-test' blob | commitdiff | raw
2015-09-14  Junio C HamanoMerge branch 'gb/apply-comment-typofix' blob | commitdiff | raw
2015-09-09  Junio C HamanoSync with 2.5.2 blob | commitdiff | raw
2015-09-08  Junio C HamanoMerge branch 'jc/builtin-am-signoff-regression-fix' blob | commitdiff | raw
2015-09-05  Jiang XinMerge branch 'master' of github.com:jiangxin/git into... blob | commitdiff | raw
2015-09-04  Junio C HamanoSync with maint blob | commitdiff | raw
2015-09-04  Junio C HamanoMerge branch 'sg/t3020-typofix' into maint blob | commitdiff | raw | diff to current
2015-09-02  Junio C HamanoMerge branch 'cc/trailers-corner-case-fix' blob | commitdiff | raw
2015-09-02  Junio C HamanoMerge branch 'sb/read-cache-one-indent-style-fix' blob | commitdiff | raw
2015-09-02  Junio C HamanoMerge branch 'ee/clean-test-fixes' blob | commitdiff | raw
2015-09-02  Junio C HamanoMerge branch 'jk/log-missing-default-HEAD' blob | commitdiff | raw
2015-09-01  Junio C HamanoMerge branch 'dt/commit-preserve-base-index-upon-opport... blob | commitdiff | raw
2015-09-01  Junio C HamanoMerge branch 'rt/remove-hold-lockfile-for-append' blob | commitdiff | raw
2015-09-01  Junio C HamanoMerge branch 'rs/archive-zip-many' blob | commitdiff | raw
2015-09-01  Junio C HamanoMerge branch 'ls/p4-fold-case-client-specs' blob | commitdiff | raw
2015-09-01  Junio C HamanoMerge branch 'ah/submodule-typofix-in-error' blob | commitdiff | raw
2015-09-01  Junio C HamanoMerge branch 'ah/reflog-typofix-in-error' blob | commitdiff | raw
2015-09-01  Junio C HamanoMerge branch 'ah/read-tree-usage-string' blob | commitdiff | raw
2015-09-01  Junio C HamanoMerge branch 'ah/pack-objects-usage-strings' blob | commitdiff | raw
2015-09-01  Junio C HamanoMerge branch 'br/svn-doc-include-paths-config' blob | commitdiff | raw
2015-09-01  Junio C HamanoMerge branch 'nd/fixup-linked-gitdir' blob | commitdiff | raw
2015-08-31  Junio C HamanoMerge branch 'sg/describe-contains' blob | commitdiff | raw
2015-08-31  Junio C HamanoMerge branch 'db/push-sign-if-asked' blob | commitdiff | raw
2015-08-31  Junio C HamanoMerge branch 'jk/notes-merge-config' blob | commitdiff | raw
2015-08-26  Junio C HamanoMerge branch 'sg/t3020-typofix' blob | commitdiff | raw | diff to current
2015-08-17  Jacob Kellernotes: teach git-notes about notes.<name>.mergeStrategy... blob | commitdiff | raw
2015-08-17  Jacob Kellernotes: add notes.mergeStrategy option to select default... blob | commitdiff | raw | diff to current
2015-06-16  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' into maint blob | commitdiff | raw | diff to current
2015-06-01  Junio C HamanoMerge branch 'mc/commit-doc-grammofix' blob | commitdiff | raw | diff to current
2015-05-26  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long' into... blob | commitdiff | raw | diff to current
2015-05-11  Junio C HamanoMerge branch 'sg/complete-decorate-full-not-long' blob | commitdiff | raw | diff to current
2015-04-19  Junio C HamanoMerge tag 'gitgui-0.20.0' of repo.or.cz/r/git-gui blob | commitdiff | raw | diff to current
2015-03-24  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2015-03-05  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes... blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'sb/hex-object-name-is-at-most-41-bytes... blob | commitdiff | raw | diff to current
2015-02-25  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot... blob | commitdiff | raw | diff to current
2015-02-17  Junio C HamanoMerge branch 'jk/remote-curl-an-array-in-struct-cannot... blob | commitdiff | raw | diff to current
2015-01-12  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' into... blob | commitdiff | raw | diff to current
2014-12-22  Junio C HamanoMerge branch 'rw/apply-does-not-take-ignore-date' blob | commitdiff | raw | diff to current
2014-10-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into... blob | commitdiff | raw | diff to current
2014-10-14  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' blob | commitdiff | raw | diff to current
2014-09-30  Junio C HamanoMerge branch 'sb/merge-recursive-copy-paste-fix' blob | commitdiff | raw | diff to current
2014-09-26  Junio C HamanoMerge branch 'sb/help-unknown-command-sort-fix' blob | commitdiff | raw | diff to current
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2014-06-27  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2014-06-26  Junio C HamanoMerge early parts from git://ozlabs.org/~paulus/gitk.git blob | commitdiff | raw | diff to current
2014-06-26  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0' blob | commitdiff | raw | diff to current
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui blob | commitdiff | raw | diff to current
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into... blob | commitdiff | raw | diff to current
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint blob | commitdiff | raw | diff to current
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc' blob | commitdiff | raw | diff to current
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon' blob | commitdiff | raw | diff to current
2013-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang' blob | commitdiff | raw | diff to current
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2013-03-28  Junio C HamanoMerge branch 'jc/remove-treesame-parent-in-simplify... blob | commitdiff | raw | diff to current
2013-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint blob | commitdiff | raw | diff to current
2013-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2013-01-28  Junio C HamanoMerge branch 'dl/am-hg-locale' blob | commitdiff | raw | diff to current
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint blob | commitdiff | raw | diff to current
2013-01-12  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' blob | commitdiff | raw | diff to current
2013-01-10  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' into... blob | commitdiff | raw | diff to current
2013-01-08  Junio C HamanoMerge branch 'ta/remove-stale-translated-tut' blob | commitdiff | raw | diff to current
2012-10-17  Junio C HamanoMerge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui blob | commitdiff | raw | diff to current
2012-10-08  Junio C HamanoMerge branch 'os/commit-submodule-ignore' into maint blob | commitdiff | raw | diff to current
2012-10-01  Junio C HamanoMerge branch 'os/commit-submodule-ignore' blob | commitdiff | raw | diff to current
2012-09-15  Junio C HamanoMerge branch 'da/gitk-reload-tag-contents' into maint... blob | commitdiff | raw | diff to current
2012-09-12  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.