diff: do not reuse_worktree_file for submodules
[gitweb.git] / t / t7600-merge.sh
2013-11-07 Merge branch 'vd/doc-unpack-objects' into maint
2013-11-07 Merge branch 'hn/log-graph-color-octopus' into maint
2013-11-07 Merge branch 'mm/checkout-auto-track-fix' into maint
2013-11-07 Merge branch 'jc/revision-range-unpeel' into maint
2013-10-28 Merge branch 'jk/format-patch-from' into maint
2013-10-28 Merge branch 'jk/shortlog-tolerate-broken-commit' into...
2013-10-28 Merge branch 'jk/diff-algo' into maint
2013-10-23 Merge branch 'jc/ls-files-killed-optim' into maint
2013-10-23 Merge branch 'jh/checkout-auto-tracking' into maint
2013-10-17 Merge branch 'jk/upload-pack-keepalive' into maint
2013-10-17 Merge branch 'bc/http-backend-allow-405' into maint
2013-10-17 Merge branch 'jc/cvsserver-perm-bit-fix' into maint
2013-10-17 Merge branch 'nd/git-dir-pointing-at-gitfile' into...
2013-10-17 Merge branch 'es/rebase-i-respect-core-commentchar...
2013-09-26 Merge branch 'mm/rebase-continue-freebsd-WB' into maint
2013-09-26 Merge branch 'km/svn-1.8-serf-only' into maint
2013-09-26 Merge branch 'js/xread-in-full' into maint
2013-09-26 Merge branch 'bc/send-email-ssl-die-message-fix' into...
2013-09-18 Merge branch 'jl/some-submodule-config-are-not-boolean...
2013-09-18 Merge branch 'tr/log-full-diff-keep-true-parents' into...
2013-09-18 Merge branch 'jk/mailmap-incomplete-line' into maint
2013-09-05 Merge branch 'nd/fetch-pack-shallow-fix' into maint
2013-09-05 Merge branch 'hv/config-from-blob' into maint
2013-09-05 Merge branch 'maint-1.8.3' into maint
2013-09-05 Merge branch 'maint-1.8.2' into maint-1.8.3
2013-09-03 Merge branch 'maint-1.8.3' into maint
2013-09-03 Merge branch 'maint-1.8.2' into maint-1.8.3
2013-08-13 Merge branch 'sb/mailmap-updates'
2013-08-09 Merge branch 'maint'
2013-08-09 Merge branch 'jk/submodule-subdirectory-ok'
2013-08-09 Merge branch 'sb/mailmap-updates'
2013-08-05 Sync with maint to grab trivial doc fixes
2013-08-05 Merge branch 'es/blame-L-breakage'
2013-08-05 Merge branch 'sb/mailmap-updates'
2013-08-05 Merge branch 'dn/test-reject-utf-16'
2013-08-05 Merge branch 'bc/commit-invalid-utf8'
2013-08-02 Merge branch 'rj/cygwin-clarify-use-of-cheating-lstat'
2013-08-02 Merge branch 'jk/cat-file-batch-optim'
2013-08-01 Merge branch 'ob/typofixes'
2013-08-01 Merge branch 'jc/rm-submodule-error-message'
2013-08-01 Merge branch 'lf/echo-n-is-not-portable'
2013-08-01 Merge branch 'ma/hg-to-git'
2013-08-01 Merge branch 'jx/clean-interactive'
2013-07-31 Merge branch 'rr/rebase-autostash'
2013-07-31 Merge branch 'rj/commit-slab-fix'
2013-07-31 Merge branch 'jk/commit-how-to-abort-cherry-pick'
2013-07-31 Merge branch 'ds/doc-two-kinds-of-tags'
2013-07-31 Merge branch 'rr/maint-tilde-markup-in-doc'
2013-07-31 Merge branch 'mh/packed-refs-do-one-ref-recursion'
2013-07-30 Merge branch 'jk/capabilities-doc'
2013-07-30 Merge branch 'sb/mailmap-updates'
2013-07-30 Merge branch 'bc/completion-for-bash-3.0'
2013-07-25 Merge branch 'mh/multimail'
2013-07-25 Merge branch 'ob/typofixes'
2013-07-25 Merge branch 'es/contacts'
2013-07-25 Merge branch 'ml/cygwin-updates'
2013-07-25 Merge branch 'rj/sparse'
2013-07-25 Merge branch 'sb/traverse-trees-bitmask-variable-name'
2013-07-25 Merge branch 'jk/cat-file-batch-optim'
2013-07-25 Merge branch 'ml/avoid-using-grep-on-crlf-files'
2013-07-25 Merge branch 'jm/doc-ref-prune'
2013-07-25 Merge branch 'rh/template-updates'
2013-07-25 Merge branch 'mh/ref-races-optim-invalidate-cached'
2013-07-25 Merge branch 'sb/misc-fixes'
2013-07-25 Merge branch 'tr/line-log'
2013-07-23 Merge branch 'mv/merge-ff-tristate'
2013-07-23 t7600: fix typo in test title
2013-07-22 Sync with Git 1.8.3.4
2013-07-22 Merge branch 'jc/name-rev-exact-ref'
2013-07-22 Merge branch 'rr/send-email-ssl-verify'
2013-07-22 Merge branch 'es/check-mailmap'
2013-07-22 Merge branch 'jx/clean-interactive'
2013-07-22 Merge branch 'hv/config-from-blob'
2013-07-22 Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'
2013-07-22 Merge branch 'jk/t0008-sigpipe-fix'
2013-07-22 Merge branch 'nd/const-struct-cache-entry'
2013-07-22 Merge branch 'jk/gcc-function-attributes'
2013-07-22 Merge branch 'db/show-ref-head'
2013-07-22 Merge branch 'es/blame-L-breakage'
2013-07-22 Merge branch 'tr/protect-low-3-fds'
2013-07-22 Merge branch 'sb/parse-object-buffer-eaten'
2013-07-22 Merge branch 'tr/do-not-call-submodules-subprojects'
2013-07-22 Merge branch 'mm/diff-no-patch-synonym-to-s'
2013-07-22 Merge branch 'dw/request-pull-diag'
2013-07-22 Merge branch 'jc/mailmap-case-insensitivity'
2013-07-22 Merge branch 'tr/fd-gotcha-fixes'
2013-07-22 Merge branch 'mm/color-auto-default'
2013-07-22 Merge branch 'jc/simple-add-must-be-a-no-op'
2013-07-22 Sync with maint
2013-07-22 Merge branch 'rr/maint-fetch-tag-doc-asterisks' into...
2013-07-22 Merge branch 'dk/maint-t5150-dirname' into maint
2013-07-22 Merge branch 'dk/version-gen-gitdir' into maint
2013-07-22 Merge branch 'nk/config-local-doc' into maint
2013-07-22 Merge branch 'kb/diff-blob-blob-doc' into maint
2013-07-22 Merge branch 'mm/merge-in-dirty-worktree-doc' into...
2013-07-22 Merge branch 'ph/builtin-srcs-are-in-subdir-these-days...
2013-07-22 Merge branch 'ft/doc-git-transport' into maint
2013-07-22 Merge branch 'mh/maint-lockfile-overflow' into maint
2013-07-22 Merge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19 Sync with maint
next