Andrew's git - gitweb.git/history - t/t7610-mergetool.sh

[gitweb.git] / t / t7610-mergetool.sh

2018-07-03	t: use test_write_lines() instead of series of 'echo...	blob \| diff \| raw
2018-06-28	Merge branch 'jk/fetch-all-peeled-fix'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'ks/branch-set-upstream'	blob \| diff \| raw \| diff to current
2018-06-18	Merge branch 'mw/doc-merge-enumfix'	blob \| diff \| raw \| diff to current
2018-05-30	Merge branch 'rs/no-null-ptr-arith-in-fast-export'	blob \| diff \| raw \| diff to current
2018-05-23	Merge branch 'tb/test-apfs-utf8-normalization'	blob \| diff \| raw \| diff to current
2018-05-22	Sync with Git 2.14.4	blob \| diff \| raw \| diff to current
2018-05-22	Merge branch 'jk/submodule-name-verify-fix' into jk...	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'nd/submodule-status-fix'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'ab/git-svn-get-record-typofix'	blob \| diff \| raw \| diff to current
2018-05-08	Merge branch 'sg/doc-gc-quote-mismatch-fix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'bp/fsmonitor-bufsize-fix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'es/fread-reads-dir-autoconf-fix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'js/t5404-path-fix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'mn/send-email-credential-doc'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'ak/bisect-doc-typofix'	blob \| diff \| raw \| diff to current
2018-04-25	Merge branch 'bw/commit-partial-from-subdirectory-fix'	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| diff \| raw \| diff to current
2018-04-10	Merge branch 'jk/diff-highlight-graph-fix'	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'sm/mv-dry-run-update' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'gs/test-unset-xdg-cache-home' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'sb/status-doc-fix' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'bp/fsmonitor' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'bc/doc-interpret-trailers-grammofix'...	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'sg/doc-test-must-fail-args' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'nd/ignore-glob-doc-update' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'tz/doc-show-defaults-to-head' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'jc/mailinfo-cleanup-fix' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'rb/hashmap-h-compilation-fix' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'cl/t9001-cleanup' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'jt/fsck-code-cleanup' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'nd/diff-flush-before-warning' into maint	blob \| diff \| raw \| diff to current
2018-03-22	Merge branch 'sg/travis-build-during-script-phase'...	blob \| diff \| raw \| diff to current
2018-03-21	Merge branch 'dp/merge-strategy-doc-fix'	blob \| diff \| raw \| diff to current
2018-03-21	Merge branch 'ks/t3200-typofix'	blob \| diff \| raw \| diff to current
2018-03-08	Merge branch 'mk/doc-pretty-fill'	blob \| diff \| raw \| diff to current
2018-03-08	Merge branch 'ds/mark-parents-uninteresting-optim'	blob \| diff \| raw \| diff to current
2018-03-08	Merge branch 'ds/find-unique-abbrev-optim'	blob \| diff \| raw \| diff to current
2018-03-08	Merge branch 'sg/travis-build-during-script-phase'	blob \| diff \| raw \| diff to current
2018-03-06	Merge branch 'xz/send-email-batch-size'	blob \| diff \| raw \| diff to current
2018-03-06	Merge branch 'sm/mv-dry-run-update'	blob \| diff \| raw \| diff to current
2018-03-06	Merge branch 'cb/ttk-style' of git-gui into cb/git...	blob \| diff \| raw \| diff to current
2018-03-02	Merge branch 'bb/ssh-key-files' of git-gui into bb...	blob \| diff \| raw \| diff to current
2018-03-02	Merge branch 'bp/bind-kp-enter' of git-gui into bp...	blob \| diff \| raw \| diff to current
2018-02-28	Merge branch 'tz/do-not-clean-spec-file'	blob \| diff \| raw \| diff to current
2018-02-28	Merge branch 'gs/test-unset-xdg-cache-home'	blob \| diff \| raw \| diff to current
2018-02-28	Merge branch 'tk/apply-dev-null-verify-name-fix'	blob \| diff \| raw \| diff to current
2018-02-28	Merge branch 'sb/status-doc-fix'	blob \| diff \| raw \| diff to current
2018-02-27	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| diff \| raw \| diff to current
2018-02-27	Merge branch 'nd/ita-wt-renames-in-status' into maint	blob \| diff \| raw \| diff to current
2018-02-27	Merge branch 'jk/sq-dequote-on-bogus-input'	blob \| diff \| raw \| diff to current
2018-02-27	Merge branch 'bp/fsmonitor'	blob \| diff \| raw \| diff to current
2018-02-27	Merge branch 'bc/doc-interpret-trailers-grammofix'	blob \| diff \| raw \| diff to current
2018-02-27	Merge branch 'sg/doc-test-must-fail-args'	blob \| diff \| raw \| diff to current
2018-02-27	Merge branch 'rs/check-ignore-multi'	blob \| diff \| raw \| diff to current
2018-02-27	Merge branch 'bp/name-hash-dirname-fix'	blob \| diff \| raw \| diff to current
2018-02-15	Merge branch 'as/read-tree-prefix-doc-fix' into maint	blob \| diff \| raw \| diff to current
2018-02-15	Merge branch 'jc/merge-symlink-ours-theirs' into maint	blob \| diff \| raw \| diff to current
2018-02-15	Merge branch 'jm/svn-pushmergeinfo-fix' into maint	blob \| diff \| raw \| diff to current
2018-02-15	Merge branch 'nd/ignore-glob-doc-update'	blob \| diff \| raw \| diff to current
2018-02-15	Merge branch 'tg/reset-hard-show-head-with-pretty'	blob \| diff \| raw \| diff to current
2018-02-15	Merge branch 'sb/pull-rebase-submodule'	blob \| diff \| raw \| diff to current
2018-02-15	Merge branch 'jt/fsck-code-cleanup'	blob \| diff \| raw \| diff to current
2018-02-13	Merge branch 'tz/doc-show-defaults-to-head'	blob \| diff \| raw \| diff to current
2018-02-13	Merge branch 'jc/mailinfo-cleanup-fix'	blob \| diff \| raw \| diff to current
2018-02-13	Merge branch 'rs/strbuf-cocci-workaround'	blob \| diff \| raw \| diff to current
2018-02-13	Merge branch 'rb/hashmap-h-compilation-fix'	blob \| diff \| raw \| diff to current
2018-02-13	Merge branch 'nd/diff-flush-before-warning'	blob \| diff \| raw \| diff to current
2018-02-13	Merge branch 'cl/t9001-cleanup'	blob \| diff \| raw \| diff to current
2018-02-13	Merge branch 'gs/retire-mru'	blob \| diff \| raw \| diff to current
2018-02-13	Merge branch 'ot/mru-on-list'	blob \| diff \| raw \| diff to current
2018-01-23	Merge branch 'as/read-tree-prefix-doc-fix'	blob \| diff \| raw \| diff to current
2018-01-23	Merge branch 'ys/bisect-object-id-missing-conversion...	blob \| diff \| raw \| diff to current
2018-01-23	Merge branch 'cc/codespeed'	blob \| diff \| raw \| diff to current
2018-01-23	Merge branch 'jc/merge-symlink-ours-theirs'	blob \| diff \| raw \| diff to current
2018-01-23	Merge branch 'jm/svn-pushmergeinfo-fix'	blob \| diff \| raw \| diff to current
2018-01-23	Merge branch 'nd/ita-wt-renames-in-status'	blob \| diff \| raw \| diff to current
2018-01-11	Merge branch 'js/test-with-ws-in-path'	blob \| diff \| raw \| diff to current
2018-01-09	Merge branch 'jk/doc-diff-options'	blob \| diff \| raw \| diff to current
2018-01-09	Merge branch 'bw/protocol-v1'	blob \| diff \| raw \| diff to current
2018-01-09	Merge branch 'sg/travis-check-untracked'	blob \| diff \| raw \| diff to current
2018-01-09	Merge branch 'js/test-with-ws-in-path'	blob \| diff \| raw \| diff to current
2018-01-09	Merge branch 'sg/travis-skip-identical-test'	blob \| diff \| raw \| diff to current
2018-01-09	Merge branch 'sg/travis-fixes'	blob \| diff \| raw \| diff to current
2018-01-09	Merge branch 'js/misc-git-gui-stuff' of ../git-gui	blob \| diff \| raw \| diff to current
2018-01-05	Merge branch 'jh/memihash-opt'	blob \| diff \| raw \| diff to current
2017-12-28	Merge branch 'sr/http-sslverify-config-doc'	blob \| diff \| raw \| diff to current
2017-12-28	Merge branch 'bp/fsmonitor'	blob \| diff \| raw \| diff to current
2017-12-27	Merge branch 'sg/travis-fixes'	blob \| diff \| raw \| diff to current
2017-12-27	Merge branch 'es/clone-shared-worktree'	blob \| diff \| raw \| diff to current
2017-12-27	Merge branch 'tb/delimit-pretty-trailers-args-with...	blob \| diff \| raw \| diff to current
2017-12-27	Merge branch 'jk/cvsimport-quoting'	blob \| diff \| raw \| diff to current
2017-12-27	Merge branch 'rs/strbuf-read-once-reset-length'	blob \| diff \| raw \| diff to current
2017-12-27	Merge branch 'rs/fmt-merge-msg-string-leak-fix'	blob \| diff \| raw \| diff to current
2017-12-27	Merge branch 'rs/am-builtin-leakfix'	blob \| diff \| raw \| diff to current
2017-12-27	Merge branch 'tb/check-crlf-for-safe-crlf'	blob \| diff \| raw \| diff to current
2017-12-19	Merge branch 'sg/setup-doc-update'	blob \| diff \| raw \| diff to current
2017-12-19	Merge branch 'bw/submodule-config-cleanup'	blob \| diff \| raw \| diff to current
2017-12-19	Merge branch 'bw/pathspec-match-submodule-boundary'	blob \| diff \| raw \| diff to current
2017-12-13	Merge branch 'jk/no-optional-locks'	blob \| diff \| raw \| diff to current
next