mingw: skip test in t1508 that fails due to path conversion
[gitweb.git] / builtin / merge-tree.c
2015-10-16 Merge branch 'jc/doc-gc-prune-now'
2015-10-16 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16 Merge branch 'es/worktree-add-cleanup' into maint
2015-10-16 Merge branch 'tk/doc-interpret-trailers-grammo' into...
2015-10-16 Merge branch 'tk/typofix-connect-unknown-proto-error...
2015-10-16 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-16 Merge branch 'nd/ls-remote-does-not-have-u-option'...
2015-10-16 Merge branch 'jc/fsck-dropped-errors' into maint
2015-10-16 Merge branch 'sb/http-flaky-test-fix' into maint
2015-10-16 Merge branch 'sb/perf-without-installed-git' into maint
2015-10-16 Merge branch 'js/icase-wt-detection' into maint
2015-10-16 Merge branch 'pt/am-builtin' into maint
2015-10-16 Merge branch 'mm/detach-at-HEAD-reflog' into maint
2015-10-16 Merge branch 'gr/rebase-i-drop-warn' into maint
2015-10-16 Merge branch 'dt/log-follow-config' into maint
2015-10-16 Merge branch 'ti/glibc-stdio-mutex-from-signal-handler...
2015-10-16 Merge branch 'jk/notes-dwim-doc' into maint
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-16 Merge branch 'jw/make-arflags-customizable' into maint
2015-10-16 Merge branch 'jk/connect-clear-env' into maint
2015-10-16 Merge branch 'jk/blame-first-parent' into maint
2015-10-16 Merge branch 'mm/keyid-docs' into maint
2015-10-16 Merge branch 'pt/pull-builtin' into maint
2015-10-15 Merge branch 'ls/p4-lfs'
2015-10-15 Merge branch 'js/gc-with-stale-symref'
2015-10-15 Merge branch 'js/clone-dissociate'
2015-10-15 Merge branch 'tk/doc-interpret-trailers-grammo'
2015-10-15 Merge branch 'es/worktree-add-cleanup'
2015-10-15 Merge branch 'dt/log-follow-config'
2015-10-15 Merge branch 'gr/rebase-i-drop-warn'
2015-10-15 Merge branch 'mm/detach-at-HEAD-reflog'
2015-10-15 Merge branch 'sa/send-email-smtp-batch-data-limit'
2015-10-15 Merge branch 'pt/am-builtin'
2015-10-15 Merge branch 'nd/clone-linked-checkout'
2015-10-15 Merge branch 'js/icase-wt-detection'
2015-10-15 Merge branch 'kn/for-each-branch'
2015-10-15 Merge branch 'sb/perf-without-installed-git'
2015-10-15 Merge branch 'sb/http-flaky-test-fix'
2015-10-15 Merge branch 'jc/fsck-dropped-errors'
2015-10-15 Merge branch 'ls/p4-translation-failure'
2015-10-15 Merge branch 'nd/gc-auto-background-fix'
2015-10-15 Merge branch 'mk/submodule-gitdir-path'
2015-10-14 Merge branch 'pt/pull-builtin'
2015-10-14 Merge branch 'nd/ls-remote-does-not-have-u-option'
2015-10-14 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-14 Merge branch 'tk/typofix-connect-unknown-proto-error'
2015-10-14 Merge branch 'jk/notes-dwim-doc'
2015-10-07 Merge branch 'ls/p4-path-encoding'
2015-10-07 Merge branch 'gb/filter-branch-progress'
2015-10-07 Merge branch 'nd/ignore-then-not-ignore'
2015-10-07 Merge branch 'ti/glibc-stdio-mutex-from-signal-handler'
2015-10-05 Sync with 2.6.1
2015-10-05 Merge branch 'jw/make-arflags-customizable'
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-09-29 Sync with v2.5.4
2015-09-28 Sync with 2.4.10
2015-09-28 Sync with 2.3.10
2015-09-28 Merge branch 'jk/xdiff-memory-limits' into maint-2.3
2015-09-28 react to errors in xdi_diff
2015-09-17 Merge branch 'as/config-doc-markup-fix'
2015-09-17 Merge branch 'br/svn-doc-include-paths-config' into...
2015-09-17 Merge branch 'ah/submodule-typofix-in-error' into maint
2015-09-14 Merge git://ozlabs.org/~paulus/gitk
2015-09-14 Merge branch 'mp/t7060-diff-index-test'
2015-09-14 Merge branch 'gb/apply-comment-typofix'
2015-09-04 Merge branch 'ee/clean-test-fixes' into maint
2015-09-04 Merge branch 'sg/t3020-typofix' into maint
2015-09-04 Merge branch 'jh/strbuf-read-use-read-in-full' into...
2015-09-02 Merge branch 'ee/clean-test-fixes'
2015-09-01 Merge branch 'ah/submodule-typofix-in-error'
2015-09-01 Merge branch 'ah/reflog-typofix-in-error'
2015-09-01 Merge branch 'ah/read-tree-usage-string'
2015-09-01 Merge branch 'ah/pack-objects-usage-strings'
2015-09-01 Merge branch 'br/svn-doc-include-paths-config'
2015-08-31 Merge branch 'sg/describe-contains'
2015-08-26 Merge branch 'sg/t3020-typofix'
2015-08-25 Merge branch 'jh/strbuf-read-use-read-in-full'
2015-08-19 Merge branch 'jc/finalize-temp-file'
2015-08-19 Merge branch 'sb/remove-unused-var-from-builtin-add...
2015-08-19 Merge branch 'nd/export-worktree' into maint
2015-08-19 Merge branch 'as/sparse-checkout-removal' into maint
2015-08-19 Merge branch 'jx/do-not-crash-receive-pack-wo-head...
2015-08-12 Merge branch 'sb/remove-unused-var-from-builtin-add'
2015-08-03 Merge branch 'jx/do-not-crash-receive-pack-wo-head'
2015-08-03 Merge branch 'as/sparse-checkout-removal'
2015-08-03 Merge branch 'jc/commit-slab'
2015-08-03 Merge branch 'nd/export-worktree'
2015-08-03 Merge branch 'sg/completion-commit-cleanup' into maint
2015-08-03 Merge branch 'sg/commit-cleanup-scissors' into maint
2015-07-27 Merge branch 'jk/pretty-encoding-doc' into maint
2015-07-27 Merge branch 'mm/branch-doc-updates' into maint
2015-07-27 Merge branch 'jc/fsck-retire-require-eoh' into maint
2015-07-27 Merge branch 'jk/rev-list-no-bitmap-while-pruning'...
2015-07-27 Merge branch 'jk/index-pack-reduce-recheck' into maint
2015-07-21 Merge branch 'tf/gitweb-typofix'
2015-07-17 Merge branch 'jk/still-interesting'
2015-07-15 Merge branch 'jc/prompt-document-ps1-state-separator...
2015-07-15 Merge branch 'es/osx-header-pollutes-mask-macro' into...
2015-07-15 Merge branch 'es/utf8-stupid-compiler-workaround' into...
2015-07-15 Merge branch 'fk/doc-format-patch-vn' into maint
next