MinGW: update tests to handle a native eol of crlf
[gitweb.git] / t / t7600-merge.sh
2014-06-27 Merge git://ozlabs.org/~paulus/gitk
2014-06-26 Merge early parts from git://ozlabs.org/~paulus/gitk.git
2014-06-26 Merge git://repo.or.cz/git-gui
2014-06-25 Merge branch 'tb/unicode-7.0-display-width'
2014-06-25 Merge branch 'ye/doc-http-proto'
2014-06-25 Merge branch 'rs/blame-refactor'
2014-06-25 Merge branch 'pb/trim-trailing-spaces'
2014-06-25 Merge branch 'mc/doc-submodule-sync-recurse'
2014-06-25 Merge branch 'sp/complete-ext-alias'
2014-06-25 Merge branch 'mc/git-p4-prepare-p4-only'
2014-06-25 Merge branch 'jk/repack-pack-writebitmaps-config'
2014-06-25 Merge branch 'nd/init-restore-env'
2014-06-25 Merge branch 'jk/repack-pack-keep-objects'
2014-06-25 Merge branch 'fr/sequencer-fail-with-not-one-upon-no-ff'
2014-06-25 Merge branch 'na/no-http-test-in-the-middle' into maint
2014-06-25 Merge branch 'jl/status-added-submodule-is-never-ignore...
2014-06-25 Merge branch 'ym/fix-opportunistic-index-update-race...
2014-06-25 Merge branch 'mk/show-s-no-extra-blank-line-for-merges...
2014-06-25 Merge branch 'rr/rebase-autostash-fix' into maint
2014-06-20 Merge branch 'jc/test-lazy-prereq' (early part)
2014-06-20 Merge branch 'jc/fetch-pull-refmap'
2014-06-20 Merge branch 'mt/send-email-cover-to-cc'
2014-06-20 Merge branch 'tb/t5551-clone-notice-to-stderr'
2014-06-20 Merge branch 'rs/more-starts-with'
2014-06-20 Merge branch 'jm/api-strbuf-doc'
2014-06-20 Merge branch 'jc/revision-dash-count-parsing'
2014-06-16 Merge branch 'ib/test-selectively-run'
2014-06-16 Merge branch 'ta/string-list-init'
2014-06-16 Merge branch 'jm/dedup-test-config'
2014-06-16 Merge branch 'dt/refs-check-refname-component-optim'
2014-06-16 Merge branch 'sk/test-cmp-bin'
2014-06-16 Merge branch 'sh/enable-preloadindex'
2014-06-16 Merge branch 'rs/read-ref-at'
2014-06-16 Merge branch 'jk/error-resolve-conflict-advice'
2014-06-16 Merge branch 'rs/pack-objects-no-unnecessary-realloc'
2014-06-16 Merge branch 'lt/log-auto-decorate'
2014-06-16 Merge branch 'jm/doc-wording-tweaks'
2014-06-16 Merge branch 'jm/format-patch-mail-sig'
2014-06-16 Merge branch 'jk/http-errors'
2014-06-16 Merge branch 'ow/config-mailmap-pathname'
2014-06-16 Merge branch 'fc/remote-helper-refmap'
2014-06-16 Merge branch 'nd/daemonize-gc'
2014-06-16 Merge branch 'jm/t9138-style-fix'
2014-06-16 Merge branch 'jm/instaweb-apache-24'
2014-06-16 Merge branch 'jl/remote-rm-prune'
2014-06-16 Merge branch 'jk/complete-merge-pull'
2014-06-16 Merge branch 'bg/xcalloc-nmemb-then-size'
2014-06-16 Merge branch 'jl/status-added-submodule-is-never-ignored'
2014-06-16 Merge branch 'cb/byte-order'
2014-06-16 Merge branch 'jk/strbuf-tolower'
2014-06-16 Merge branch 'jk/daemon-tolower'
2014-06-16 Merge branch 'as/pretty-truncate'
2014-06-16 Merge branch 'jk/diff-follow-must-take-one-pathspec'
2014-06-16 Merge branch 'sk/windows-unc-path'
2014-06-16 Merge branch 'rr/rebase-autostash-fix'
2014-06-16 Merge branch 'jk/report-fail-to-read-objects-better'
2014-06-16 Merge branch 'jk/diff-files-assume-unchanged'
2014-06-16 Merge branch 'jk/argv-array-for-child-process'
2014-06-16 Merge branch 'sk/wincred'
2014-06-16 Merge branch 'jk/do-not-run-httpd-tests-as-root'
2014-06-16 Merge branch 'cc/replace-edit'
2014-06-16 Merge branch 'mt/patch-id-stable' (early part)
2014-06-12 Sync with maint
2014-06-09 Merge branch 'jc/shortlog-ref-exclude'
2014-06-09 Merge branch 'mn/sideband-no-ansi'
2014-06-09 Merge branch 'rs/mailinfo-header-cmp'
2014-06-09 Merge branch 'pb/trim-trailing-spaces'
2014-06-09 Merge branch 'na/no-http-test-in-the-middle'
2014-06-09 Merge branch 'jc/rev-parse-argh-dashed-multi-words'
2014-06-09 Merge branch 'lt/request-pull'
2014-06-06 Merge branch 'ss/howto-manage-trunk'
2014-06-06 Merge branch 'mc/git-p4-prepare-p4-only'
2014-06-06 Merge branch 'jn/test-lint-unmoor'
2014-06-06 Merge branch 'ep/shell-assign-and-export-vars'
2014-06-06 Merge branch 'jj/command-line-adjective'
2014-06-06 Merge branch 'jc/coding-guidelines'
2014-06-06 Merge branch 'nd/status-auto-comment-char'
2014-06-06 Merge branch 'mt/rebase-i-keep-empty-test'
2014-06-06 Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-05-15 git-show: fix 'git show -s' to not add extra terminator...
2014-04-09 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-04-09 Merge commit 'doc/http-backend: missing accent grave...
2014-04-08 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-18 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18 Merge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-03-18 Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-14 Merge branch 'jc/check-attr-honor-working-tree'
2014-03-07 Merge branch 'jc/hold-diff-remove-q-synonym-for-no...
2014-03-07 Merge branch 'jc/core-checkstat-2.0'
2014-03-07 Merge branch 'jc/add-2.0-ignore-removal'
2014-03-07 Merge branch 'jn/add-2.0-u-A-sans-pathspec'
2014-03-07 Merge branch 'jc/push-2.0-default-to-simple'
2014-02-27 Merge branch 'bs/stdio-undef-before-redef'
2014-02-27 Merge branch 'jk/config-path-include-fix'
2014-02-13 Merge branch 'jc/revision-range-unpeel' into maint
2014-02-05 Merge branch 'jc/maint-pull-docfix' into maint
next