t0027: combinations of core.autocrlf, core.eol and text
[gitweb.git] / t / t7610-mergetool.sh
2013-09-20 Merge branch 'mm/status-without-comment-char'
2013-09-20 Merge branch 'rh/peeling-tag-to-tag'
2013-09-20 Merge branch 'jx/branch-vv-always-compare-with-upstream'
2013-09-20 Merge branch 'nd/fetch-into-shallow'
2013-09-19 Merge branch 'jk/config-int-range-check'
2013-09-18 Merge branch 'maint'
2013-09-18 Merge branch 'jc/url-match'
2013-09-18 Merge branch 'jc/cvsserver-perm-bit-fix'
2013-09-18 Merge branch 'bc/send-email-ssl-die-message-fix'
2013-09-18 Merge branch 'uh/git-svn-serf-fix'
2013-09-18 Merge branch 'fc/contrib-bzr-hg-fixes'
2013-09-18 Merge branch 'js/add-i-mingw'
2013-09-18 Merge branch 'ks/p4-view-spec'
2013-09-18 Merge branch 'jk/duplicate-objects-in-packs'
2013-09-18 Merge branch 'nd/git-dir-pointing-at-gitfile'
2013-09-18 Merge branch 'jk/pager-bypass-cat-for-default-pager'
2013-09-18 Merge branch 'fc/t3200-fixes'
2013-09-18 Merge branch 'fc/rev-parse-test-updates'
2013-09-17 Merge branch 'jk/remove-remote-helpers-in-python'
2013-09-17 Merge branch 'ss/doclinks'
2013-09-17 Merge branch 'rh/ishes-doc'
2013-09-17 Merge branch 'dw/diff-no-index-doc'
2013-09-17 Merge branch 'ta/user-manual'
2013-09-17 Merge branch 'fc/trivial'
2013-09-17 Merge branch 'fc/fast-export'
2013-09-17 Merge branch 'ab/gitweb-author-initials'
2013-09-17 Merge branch 'jk/has-sha1-file-retry-packed'
2013-09-17 Merge branch 'jk/write-broken-index-with-nul-sha1'
2013-09-17 Merge branch 'jx/clean-interactive'
2013-09-17 Merge branch 'tb/precompose-autodetect-fix'
2013-09-17 Merge branch 'kk/tests-with-no-perl'
2013-09-17 Merge branch 'ap/commit-author-mailmap'
2013-09-17 Merge branch 'jk/free-tree-buffer'
2013-09-17 Merge branch 'maint'
2013-09-12 Sync with maint for l10n updates
2013-09-12 Merge branch 'jc/pager-configuration-doc'
2013-09-12 Merge branch 'mm/remote-helpers-doc'
2013-09-12 Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'
2013-09-12 Merge branch 'mm/fast-import-feature-doc'
2013-09-12 Merge branch 'mm/mediawiki-dumb-push-fix'
2013-09-12 Merge branch 'jc/commit-is-spelled-with-two-ems'
2013-09-12 Merge branch 'jk/config-int-range-check'
2013-09-11 Merge branch 'jc/ls-files-killed-optim'
2013-09-11 Merge branch 'es/rebase-i-no-abbrev'
2013-09-11 Merge branch 'rt/rebase-p-no-merge-summary'
2013-09-11 Merge branch 'tf/gitweb-ss-tweak'
2013-09-11 Merge branch 'sb/mailmap-freeing-NULL-is-ok'
2013-09-11 Merge branch 'js/xread-in-full'
2013-09-11 Merge branch 'es/rebase-i-respect-core-commentchar'
2013-09-11 Merge branch 'jn/post-receive-utf8'
2013-09-11 Merge branch 'sh/pull-rebase-preserve'
2013-09-11 Merge branch 'nd/push-no-thin'
2013-09-09 Merge branch 'nd/magic-pathspec'
2013-09-09 Merge branch 'jk/mailmap-incomplete-line'
2013-09-09 Merge branch 'sp/clip-read-write-to-8mb'
2013-09-09 Merge branch 'tg/index-struct-sizes'
2013-09-09 Merge branch 'jc/transport-do-not-use-connect-twice...
2013-09-09 Merge branch 'es/contacts-blame-L-multi'
2013-09-09 Merge branch 'jc/url-match'
2013-09-09 Merge branch 'jl/submodule-mv'
2013-09-04 Merge branch 'tr/fd-gotcha-fixes'
2013-09-04 Merge branch 'jc/check-x-z'
2013-08-06 rm: delete .gitmodules entry of submodules removed...
2013-08-05 Merge branch 'dn/test-reject-utf-16'
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-30 Merge branch 'jk/capabilities-doc'
2013-07-25 Merge branch 'tr/line-log'
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 'db/show-ref-head'
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 'dw/request-pull-diag'
2013-07-22 Merge branch 'tr/fd-gotcha-fixes'
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 'mh/maint-lockfile-overflow' into maint
2013-07-22 Merge branch 'jc/maint-diff-core-safecrlf' into maint
2013-07-19 Merge branch 'rr/name-rev-stdin-doc' into maint
2013-07-19 Merge branch 'ft/diff-rename-default-score-is-half...
2013-07-19 Merge branch 'jc/t1512-fix' into maint
2013-07-19 Merge branch 'mm/push-force-is-dangerous' into maint
2013-07-19 Merge branch 'tr/test-commit-only-on-orphan' into maint
2013-07-18 Merge branch 'es/overlapping-range-set'
2013-07-15 Merge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-15 Merge branch 'bc/http-keep-memory-given-to-curl' into...
2013-07-12 Merge branch 'rs/pickaxe-simplify'
2013-07-12 Merge branch 'rr/name-rev-stdin-doc'
2013-07-12 Merge branch 'ft/diff-rename-default-score-is-half'
2013-07-12 Merge branch 'nd/warn-ambiguous-object-name' into jk...
2013-07-11 Merge branch 'jc/t1512-fix'
2013-07-11 Merge branch 'jc/maint-diff-core-safecrlf'
2013-07-11 Merge branch 'mh/maint-lockfile-overflow'
2013-07-03 Merge branch 'cr/git-work-tree-sans-git-dir' into maint
next