Merge branch 'maint-2.0' into maint-2.1
[git] / t / t3402-rebase-merge.sh
2015-01-07  Junio C HamanoMerge branch 'maint-1.9' into maint-2.0
2014-12-17  Junio C HamanoSync with v1.9.5
2014-11-12  Junio C HamanoMerge branch 'nd/gitignore-trailing-whitespace' into...
2014-11-11  Junio C HamanoMerge branch 'rs/clean-menu-item-defn' into maint
2014-10-29  Junio C HamanoMerge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-29  Junio C HamanoMerge branch 'rs/daemon-fixes' into maint
2014-10-07  Junio C HamanoMerge branch 'maint-1.9' into maint-2.0
2014-09-30  Junio C HamanoMerge branch 'jk/fsck-exit-code-fix' into maint
2014-09-30  Junio C HamanoMerge branch 'jk/index-pack-threading-races' into maint
2014-09-19  Junio C HamanoMerge branch 'et/spell-poll-infinite-with-minus-one...
2014-09-19  Junio C HamanoMerge branch 'jn/unpack-trees-checkout-m-carry-deletion...
2014-09-19  Junio C HamanoMerge branch 'sp/pack-protocol-doc-on-shallow' into...
2014-09-19  Junio C HamanoMerge branch 'rs/refresh-beyond-symlink' into maint
2014-09-19  Junio C HamanoMerge branch 'lf/bundle-exclusion' into maint
2014-09-19  Junio C HamanoMerge branch 'jc/apply-ws-prefix' into maint
2014-09-19  Junio C HamanoMerge branch 'jk/command-line-config-empty-string'...
2014-08-26  Junio C HamanoMerge branch 'jk/diff-tree-t-fix'
2014-08-26  Junio C HamanoMerge branch 'jk/pack-shallow-always-without-bitmap'
2014-08-10  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2014-08-04  Junio C HamanoMerge branch 'tf/maint-doc-push'
2014-08-04  Jiang XinMerge remote-tracking branch 'sv/nafmo/master'
2014-07-30  Junio C HamanoMerge branch 'ep/avoid-test-a-o'
2014-07-28  Junio C HamanoMerge branch 'jk/misc-fixes-maint'
2014-07-23  Junio C HamanoMerge branch 'rs/fix-unlink-unix-socket'
2014-07-23  Junio C HamanoMerge branch 'jk/tag-sort'
2014-07-22  Junio C HamanoMerge branch 'jk/alloc-commit-id'
2014-07-22  Junio C HamanoMerge branch 'kb/perf-trace'
2014-07-22  Junio C HamanoMerge branch 'ah/fix-http-push' into maint
2014-07-22  Junio C HamanoMerge branch 'po/error-message-style' into maint
2014-07-22  Junio C HamanoMerge branch 'zk/log-graph-showsig' into maint
2014-07-22  Junio C HamanoMerge branch 'mg/fix-log-mergetag-color' into maint
2014-07-22  Junio C HamanoMerge branch 'cb/filter-branch-prune-empty-degenerate...
2014-07-22  Junio C HamanoMerge branch 'ye/doc-http-proto' into maint
2014-07-22  Junio C HamanoMerge branch 'jm/api-strbuf-doc' into maint
2014-07-22  Junio C HamanoMerge branch 'jm/dedup-test-config' into maint
2014-07-22  Junio C HamanoMerge branch 'sk/test-cmp-bin' into maint
2014-07-22  Junio C HamanoMerge branch 'jm/doc-wording-tweaks' into maint
2014-07-22  Junio C HamanoMerge branch 'jm/instaweb-apache-24' into maint
2014-07-22  Junio C HamanoMerge branch 'bg/xcalloc-nmemb-then-size' into maint
2014-07-22  Junio C HamanoMerge branch 'cb/byte-order' into maint
2014-07-22  Junio C HamanoMerge branch 'lt/request-pull' into maint
2014-07-22  Junio C HamanoMerge branch 'ep/shell-assign-and-export-vars' into...
2014-07-22  Junio C HamanoMerge branch 'maint-1.9' into maint
2014-07-21  Junio C HamanoMerge branch 'kb/avoid-fchmod-for-now'
2014-07-21  Junio C HamanoMerge branch 'ek/alt-odb-entry-fix'
2014-07-21  Junio C HamanoMerge branch 'jk/remote-curl-squelch-extra-errors'
2014-07-21  Junio C HamanoMerge branch 'rs/ref-transaction-0'
2014-07-21  Junio C HamanoMerge branch 'jl/submodule-tests'
2014-07-16  Junio C HamanoMerge branch 'ah/fix-http-push'
2014-07-16  Junio C HamanoMerge branch 'jk/skip-prefix'
2014-07-16  Junio C HamanoMerge branch 'po/error-message-style'
2014-07-16  Junio C HamanoMerge branch 'zk/log-graph-showsig'
2014-07-16  Junio C HamanoMerge branch 'mg/fix-log-mergetag-color'
2014-07-16  Junio C HamanoMerge branch 'kb/path-max-must-go'
2014-07-16  Junio C HamanoMerge branch 'cb/filter-branch-prune-empty-degenerate...
2014-07-16  Junio C HamanoMerge branch 'mk/merge-incomplete-files'
2014-07-16  Junio C HamanoMerge branch 'jk/strip-suffix'
2014-07-16  Junio C HamanoMerge branch 'ep/submodule-code-cleanup'
2014-07-16  Junio C HamanoMerge branch 'jk/replace-edit-raw'
2014-07-16  Junio C HamanoMerge branch 'cc/replace-edit'
2014-07-16  Junio C HamanoMerge branch 'tb/crlf-tests'
2014-07-16  Junio C HamanoMerge branch 'nd/split-index'
2014-07-16  Junio C HamanoMerge branch 'jc/fix-clone-single-starting-at-a-tag...
2014-07-16  Junio C HamanoMerge branch 'jk/pretty-G-format-fixes' into maint
2014-07-16  Junio C HamanoMerge branch 'rs/fix-alt-odb-path-comparison' into...
2014-07-16  Junio C HamanoMerge branch 'jk/commit-buffer-length' into maint
2014-07-16  Junio C HamanoMerge branch 'bc/fix-rebase-merge-skip' into maint
2014-07-10  Junio C HamanoMerge branch 'maint'
2014-07-10  Junio C HamanoMerge branch 'dt/refs-check-refname-component-sse-fix'
2014-07-10  Junio C HamanoMerge branch 'rs/fix-alt-odb-path-comparison'
2014-07-10  Junio C HamanoMerge branch 'rs/status-code-clean-up'
2014-07-10  Junio C HamanoMerge branch 'kb/path-max-must-go'
2014-07-10  Junio C HamanoMerge branch 'mg/verify-commit'
2014-07-10  Junio C HamanoMerge branch 'jc/fix-clone-single-starting-at-a-tag'
2014-07-09  Junio C HamanoMerge branch 'sk/mingw-unicode-spawn-args'
2014-07-09  Junio C HamanoMerge branch 'sk/mingw-dirent'
2014-07-09  Junio C HamanoMerge branch 'sk/mingw-uni-console'
2014-07-09  Junio C HamanoMerge branch 'sk/mingw-main'
2014-07-09  Junio C HamanoMerge branch 'jk/pretty-G-format-fixes'
2014-07-09  Junio C HamanoMerge branch 'jk/xstrfmt'
2014-07-09  Junio C HamanoMerge branch 'jk/skip-prefix'
2014-07-02  Junio C HamanoMerge branch 'dt/refs-check-refname-component-sse'
2014-07-02  Junio C HamanoMerge branch 'ye/http-extract-charset'
2014-07-02  Junio C HamanoMerge branch 'bc/fix-rebase-merge-skip'
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-06-16  brian m. carlsonrebase--merge: fix --skip with two conflicts in a row
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
next