Andrew's git - gitweb.git/history - t/t6038-merge-text-auto.sh

[gitweb.git] / t / t6038-merge-text-auto.sh

2016-09-12	Merge branch 'jc/submodule-anchor-git-dir'	blob \| diff \| raw
2016-09-12	Merge branch 'jk/squelch-false-warning-from-gcc-o3'	blob \| diff \| raw
2016-09-12	Merge branch 'jk/test-lib-drop-pid-from-results'	blob \| diff \| raw
2016-09-09	Merge branch 'hv/doc-commit-reference-style'	blob \| diff \| raw
2016-09-09	Merge branch 'po/range-doc'	blob \| diff \| raw
2016-09-09	Merge branch 'rt/help-unknown'	blob \| diff \| raw
2016-09-09	Merge branch 'jk/format-patch-number-singleton-patch...	blob \| diff \| raw
2016-09-09	Merge branch 'hv/doc-commit-reference-style' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'sg/reflog-past-root' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'rs/mailinfo-lib' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'jk/tighten-alloc' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'rs/use-strbuf-add-unique-abbrev' into...	blob \| diff \| raw
2016-09-09	Merge branch 'rs/merge-recursive-string-list-init'...	blob \| diff \| raw
2016-09-09	Merge branch 'rs/merge-add-strategies-simplification...	blob \| diff \| raw
2016-09-09	Merge branch 'ls/packet-line-protocol-doc-fix' into...	blob \| diff \| raw
2016-09-09	Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile...	blob \| diff \| raw
2016-09-09	Merge branch 'dg/document-git-c-in-git-config-doc'...	blob \| diff \| raw
2016-09-09	Merge branch 'js/no-html-bypass-on-windows' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'jk/difftool-command-not-found' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'sb/checkout-explit-detach-no-advice'...	blob \| diff \| raw
2016-09-09	Merge branch 'rs/pull-signed-tag' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'js/test-lint-pathname' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'js/mv-dir-to-new-directory' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'js/import-tars-hardlinks' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'ms/document-pack-window-memory-is-per...	blob \| diff \| raw
2016-09-09	Merge branch 'jk/push-force-with-lease-creation' into...	blob \| diff \| raw
2016-09-09	Merge branch 'jk/reflog-date' into maint	blob \| diff \| raw
2016-09-09	Merge branch 'jc/renormalize-merge-kill-safer-crlf...	blob \| diff \| raw
2016-08-31	Merge branch 'ls/packet-line-protocol-doc-fix'	blob \| diff \| raw
2016-08-31	Merge branch 'mh/blame-worktree'	blob \| diff \| raw
2016-08-31	Merge branch 'kw/patch-ids-optim'	blob \| diff \| raw
2016-08-25	Merge branch 'bw/mingw-avoid-inheriting-fd-to-lockfile'	blob \| diff \| raw
2016-08-25	Merge branch 'dg/document-git-c-in-git-config-doc'	blob \| diff \| raw
2016-08-25	Merge branch 'js/no-html-bypass-on-windows'	blob \| diff \| raw
2016-08-25	Merge branch 'hv/doc-commit-reference-style'	blob \| diff \| raw
2016-08-19	Merge branch 'ab/hooks'	blob \| diff \| raw
2016-08-19	Merge branch 'jk/difftool-command-not-found'	blob \| diff \| raw
2016-08-19	Merge branch 'sb/checkout-explit-detach-no-advice'	blob \| diff \| raw
2016-08-19	Merge branch 'rs/pull-signed-tag'	blob \| diff \| raw
2016-08-17	Merge branch 'js/test-lint-pathname'	blob \| diff \| raw
2016-08-17	Merge branch 'sg/reflog-past-root'	blob \| diff \| raw
2016-08-17	Merge branch 'rs/mailinfo-lib'	blob \| diff \| raw
2016-08-17	Merge branch 'jk/tighten-alloc'	blob \| diff \| raw
2016-08-16	Merge branch 'lt/gpg-show-long-key-in-signature-verific...	blob \| diff \| raw
2016-08-12	Sync with 2.9.3	blob \| diff \| raw
2016-08-12	Merge branch 'kw/patch-ids-optim'	blob \| diff \| raw
2016-08-12	Merge branch 'ew/http-backend-batch-headers'	blob \| diff \| raw
2016-08-12	Merge branch 'js/mv-dir-to-new-directory'	blob \| diff \| raw
2016-08-12	Merge branch 'rs/use-strbuf-add-unique-abbrev'	blob \| diff \| raw
2016-08-12	Merge branch 'jk/big-and-future-archive-tar'	blob \| diff \| raw
2016-08-12	Merge branch 'rs/merge-recursive-string-list-init'	blob \| diff \| raw
2016-08-12	Merge branch 'rs/merge-add-strategies-simplification'	blob \| diff \| raw
2016-08-12	Merge branch 'js/import-tars-hardlinks'	blob \| diff \| raw
2016-08-12	Merge branch 'ms/document-pack-window-memory-is-per...	blob \| diff \| raw
2016-08-12	Merge branch 'vs/completion-branch-fully-spelled-d...	blob \| diff \| raw
2016-08-12	Merge branch 'sb/submodule-clone-retry'	blob \| diff \| raw
2016-08-10	Sync with maint	blob \| diff \| raw
2016-08-10	Merge branch 'js/commit-slab-decl-fix'	blob \| diff \| raw
2016-08-10	Merge branch 'jk/completion-diff-submodule'	blob \| diff \| raw
2016-08-10	Merge branch 'cc/mailmap-tuxfamily'	blob \| diff \| raw
2016-08-10	Merge branch 'jt/format-patch-from-config'	blob \| diff \| raw
2016-08-10	Merge branch 'jk/push-force-with-lease-creation'	blob \| diff \| raw
2016-08-10	Merge branch 'jk/reset-ident-time-per-commit'	blob \| diff \| raw
2016-08-08	Sync with maint	blob \| diff \| raw
2016-08-08	Merge branch 'jc/hashmap-doc-init'	blob \| diff \| raw
2016-08-08	Merge branch 'ew/build-time-pager-tweaks'	blob \| diff \| raw
2016-08-08	Merge branch 'sb/submodule-recommend-shallowness'	blob \| diff \| raw
2016-08-08	Merge branch 'jk/parseopt-string-list'	blob \| diff \| raw
2016-08-08	Merge branch 'jh/clean-smudge-f-doc'	blob \| diff \| raw
2016-08-08	Merge branch 'js/nedmalloc-gcc6-warnings'	blob \| diff \| raw
2016-08-08	Merge branch 'nd/fbsd-lazy-mtime'	blob \| diff \| raw
2016-08-08	Merge branch 'nd/log-decorate-color-head-arrow'	blob \| diff \| raw
2016-08-08	Merge branch 'rs/use-strbuf-addstr'	blob \| diff \| raw
2016-08-08	Merge branch 'ib/t3700-add-chmod-x-updates'	blob \| diff \| raw
2016-08-08	Merge branch 'ab/gitweb-link-html-escape'	blob \| diff \| raw
2016-08-08	Merge branch 'jk/pack-objects-optim'	blob \| diff \| raw
2016-08-08	Merge branch 'jk/difftool-in-subdir'	blob \| diff \| raw
2016-08-08	Merge branch 'js/rebase-i-progress-tidy'	blob \| diff \| raw
2016-08-08	Merge branch 'jk/reflog-date'	blob \| diff \| raw
2016-08-08	Merge branch 'cp/completion-clone-recurse-submodules'	blob \| diff \| raw
2016-08-08	Merge branch 'jk/t4205-cleanup'	blob \| diff \| raw
2016-08-08	Merge branch 'da/subtree-modernize'	blob \| diff \| raw
2016-08-08	Merge branch 'nd/fetch-ref-summary'	blob \| diff \| raw
2016-08-08	Merge branch 'ew/git-svn-http-tests'	blob \| diff \| raw
2016-08-08	Merge branch 'js/t4130-rename-without-ino'	blob \| diff \| raw
2016-08-04	Merge branch 'jc/grep-commandline-vs-configuration'	blob \| diff \| raw
2016-08-04	Merge branch 'sb/submodule-clone-retry'	blob \| diff \| raw
2016-08-04	Merge branch 'sb/pack-protocol-doc-nak'	blob \| diff \| raw
2016-08-03	Merge branch 'jk/diff-do-not-reuse-wtf-needs-cleaning'	blob \| diff \| raw
2016-08-03	Merge branch 'rs/submodule-config-code-cleanup'	blob \| diff \| raw
2016-08-03	Merge branch 'jk/push-progress'	blob \| diff \| raw
2016-08-03	Merge branch 'jt/fetch-large-handshake-window-on-http'	blob \| diff \| raw
2016-08-03	Merge branch 'jk/git-jump'	blob \| diff \| raw
2016-08-03	Merge branch 'mm/status-suggest-merge-abort'	blob \| diff \| raw
2016-08-03	Merge branch 'jk/parse-options-concat'	blob \| diff \| raw
2016-08-03	Merge branch 'sb/push-options'	blob \| diff \| raw
2016-08-03	Merge branch 'ew/http-walker'	blob \| diff \| raw
2016-08-03	Merge branch 'pm/build-persistent-https-with-recent-go'	blob \| diff \| raw
2016-08-03	Merge branch 'da/subtree-2.9-regression'	blob \| diff \| raw
2016-08-03	Merge branch 'os/no-verify-skips-commit-msg-too'	blob \| diff \| raw
next