git.oblomov.eu Git - git/history - t/t7610-mergetool.sh

2014-11-06	Junio C Hamano	Merge branch 'tm/line-log-first-parent'	blob \| commitdiff \| raw
2014-11-06	Junio C Hamano	Merge branch 'jk/fetch-reflog-df-conflict'	blob \| commitdiff \| raw
2014-11-06	Junio C Hamano	Merge branch 'jk/cache-tree-protect-from-broken-libgit2'	blob \| commitdiff \| raw
2014-10-31	Junio C Hamano	Merge branch 'jc/push-cert'	blob \| commitdiff \| raw
2014-10-31	Junio C Hamano	Merge branch 'rs/child-process-init'	blob \| commitdiff \| raw
2014-10-31	Junio C Hamano	Merge branch 'rs/grep-color-words'	blob \| commitdiff \| raw
2014-10-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2014-10-29	Junio C Hamano	Sync with Git 2.1.3	blob \| commitdiff \| raw
2014-10-29	Junio C Hamano	Merge branch 'bc/asciidoc-pretty-formats-fix' into...	blob \| commitdiff \| raw \| diff to current
2014-10-29	Junio C Hamano	Merge branch 'da/difftool'	blob \| commitdiff \| raw
2014-10-29	Junio C Hamano	Merge branch 'rb/pack-window-memory-config-doc'	blob \| commitdiff \| raw
2014-10-29	Junio C Hamano	Merge branch 'mg/lib-gpg-ro-safety'	blob \| commitdiff \| raw
2014-10-29	Junio C Hamano	Merge branch 'dm/port2zos'	blob \| commitdiff \| raw
2014-10-29	Junio C Hamano	Merge branch 'oc/mergetools-beyondcompare'	blob \| commitdiff \| raw
2014-10-29	Junio C Hamano	Merge branch 'jk/prune-mtime'	blob \| commitdiff \| raw
2014-10-29	Junio C Hamano	Merge branch 'bc/asciidoctor'	blob \| commitdiff \| raw
2014-10-24	Junio C Hamano	Merge branch 'jc/push-cert'	blob \| commitdiff \| raw
2014-10-24	Junio C Hamano	Merge branch 'sb/plug-transport-leak'	blob \| commitdiff \| raw
2014-10-24	Junio C Hamano	Merge branch 'nd/dir-prep-exclude-cleanup'	blob \| commitdiff \| raw
2014-10-24	Junio C Hamano	Merge branch 'eb/no-pthreads'	blob \| commitdiff \| raw
2014-10-24	Junio C Hamano	Merge branch 'wk/t1304-wo-USER'	blob \| commitdiff \| raw
2014-10-24	Junio C Hamano	Merge branch 'tb/core-filemode-doc'	blob \| commitdiff \| raw
2014-10-24	Junio C Hamano	Merge branch 'rs/run-command-env-array'	blob \| commitdiff \| raw
2014-10-24	Junio C Hamano	Merge branch 'po/doc-status-markup'	blob \| commitdiff \| raw
2014-10-24	Junio C Hamano	Merge branch 'jk/pack-objects-no-bitmap-when-splitting'	blob \| commitdiff \| raw
2014-10-21	Junio C Hamano	Merge branch 'js/completion-hide-not-a-repo'	blob \| commitdiff \| raw
2014-10-21	Junio C Hamano	Merge branch 'da/mergetool-meld'	blob \| commitdiff \| raw
2014-10-21	Junio C Hamano	Merge branch 'da/mergetool-temporary-directory'	blob \| commitdiff \| raw
2014-10-21	Junio C Hamano	Merge branch 'da/mergetool-tool-help'	blob \| commitdiff \| raw \| diff to current
2014-10-21	Junio C Hamano	Merge branch 'da/mergetool-tests'	blob \| commitdiff \| raw \| diff to current
2014-10-16	David Aguilar	t7610-mergetool: add test cases for mergetool.writeToTemp	blob \| commitdiff \| raw \| diff to current
2014-10-16	David Aguilar	t7610-mergetool: use test_config to isolate tests	blob \| commitdiff \| raw \| diff to current
2014-10-15	David Aguilar	t7610-mergetool: prefer test_config over git config	blob \| commitdiff \| raw \| diff to current
2014-10-15	David Aguilar	t7610-mergetool: add missing && and remove commented...	blob \| commitdiff \| raw \| diff to current
2014-10-15	David Aguilar	t7610-mergetool: use tabs instead of a mix of tabs...	blob \| commitdiff \| raw \| diff to current
2014-10-14	Junio C Hamano	Merge branch 'bc/asciidoc-pretty-formats-fix'	blob \| commitdiff \| raw \| diff to current
2014-09-30	Junio C Hamano	Merge branch 'sb/merge-recursive-copy-paste-fix'	blob \| commitdiff \| raw \| diff to current
2014-09-26	Junio C Hamano	Merge branch 'sb/help-unknown-command-sort-fix'	blob \| commitdiff \| raw \| diff to current
2014-09-09	Junio C Hamano	Merge branch 'rs/clean-menu-item-defn'	blob \| commitdiff \| raw \| diff to current
2014-08-10	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-06-27	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2014-06-26	Junio C Hamano	Merge early parts from git://ozlabs.org/~paulus/gitk.git	blob \| commitdiff \| raw \| diff to current
2014-06-26	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2014-06-25	Junio C Hamano	Merge branch 'rr/rebase-autostash-fix' into maint	blob \| commitdiff \| raw \| diff to current
2014-06-25	Junio C Hamano	Merge branch 'jc/shortlog-ref-exclude' into maint	blob \| commitdiff \| raw \| diff to current
2014-06-20	Junio C Hamano	Merge branch 'tb/t5551-clone-notice-to-stderr'	blob \| commitdiff \| raw \| diff to current
2014-06-16	Junio C Hamano	Merge branch 'rr/rebase-autostash-fix'	blob \| commitdiff \| raw \| diff to current
2014-06-09	Junio C Hamano	Merge branch 'jc/shortlog-ref-exclude'	blob \| commitdiff \| raw \| diff to current
2014-05-19	Junio C Hamano	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| commitdiff \| raw \| diff to current
2014-05-08	Junio C Hamano	Merge branch 'cl/p4-use-diff-tree' into maint	blob \| commitdiff \| raw \| diff to current
2014-05-07	Junio C Hamano	Merge branch 'cl/p4-use-diff-tree'	blob \| commitdiff \| raw \| diff to current
2014-04-09	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix' into maint	blob \| commitdiff \| raw \| diff to current
2014-04-09	Junio C Hamano	Merge commit 'doc/http-backend: missing accent grave...	blob \| commitdiff \| raw \| diff to current
2014-04-08	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix'	blob \| commitdiff \| raw \| diff to current
2014-04-03	Junio C Hamano	Merge branch 'mh/remove-subtree-long-pathname-fix'...	blob \| commitdiff \| raw \| diff to current
2014-04-03	Junio C Hamano	Merge branch 'jc/stash-pop-not-popped' into maint	blob \| commitdiff \| raw \| diff to current
2014-03-31	Junio C Hamano	Merge branch 'wt/doc-submodule-name-path-confusion-1'	blob \| commitdiff \| raw \| diff to current
2014-03-31	Junio C Hamano	Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'	blob \| commitdiff \| raw \| diff to current
2014-03-25	Junio C Hamano	Merge branch 'dm/configure-iconv-locale-charset'	blob \| commitdiff \| raw \| diff to current
2014-03-25	Junio C Hamano	Merge branch 'mh/remove-subtree-long-pathname-fix'	blob \| commitdiff \| raw \| diff to current
2014-03-25	Junio C Hamano	Merge branch 'cp/am-patch-format-doc'	blob \| commitdiff \| raw \| diff to current
2014-03-21	Junio C Hamano	Merge branch 'es/sh-i18n-envsubst'	blob \| commitdiff \| raw \| diff to current
2014-03-21	Junio C Hamano	Merge branch 'jc/stash-pop-not-popped'	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix' into maint	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'tr/diff-submodule-no-reuse-worktree'...	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jc/check-attr-honor-working-tree' into...	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'bk/refresh-missing-ok-in-merge-recursive...	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jk/config-path-include-fix' into maint	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'nd/diff-quiet-stat-dirty' into maint	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'mh/simplify-cache-tree-find'	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'jn/branch-lift-unnecessary-name-length...	blob \| commitdiff \| raw \| diff to current
2014-03-18	Junio C Hamano	Merge branch 'nd/sha1-file-delta-stack-leakage-fix'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'sh/write-pack-file-warning-message-fix'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'jk/commit-dates-parsing-fix'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'jh/note-trees-record-blobs'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'tr/diff-submodule-no-reuse-worktree'	blob \| commitdiff \| raw \| diff to current
2014-03-14	Junio C Hamano	Merge branch 'jc/check-attr-honor-working-tree'	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/hold-diff-remove-q-synonym-for-no...	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/core-checkstat-2.0'	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/add-2.0-ignore-removal'	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jn/add-2.0-u-A-sans-pathspec'	blob \| commitdiff \| raw \| diff to current
2014-03-07	Junio C Hamano	Merge branch 'jc/push-2.0-default-to-simple'	blob \| commitdiff \| raw \| diff to current
2014-03-03	Junio C Hamano	Merge branch 'sh/write-pack-file-warning-message-fix...	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'nd/test-rename-reset'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'bs/stdio-undef-before-redef'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'jk/config-path-include-fix'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'nd/diff-quiet-stat-dirty'	blob \| commitdiff \| raw \| diff to current
2014-02-27	Junio C Hamano	Merge branch 'bk/refresh-missing-ok-in-merge-recursive'	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'bm/merge-base-octopus-dedup' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'jc/revision-range-unpeel' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'jk/allow-fetch-onelevel-refname' into...	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'sb/repack-in-c' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-13	Junio C Hamano	Merge branch 'as/tree-walk-fix-aggressive-short-cut...	blob \| commitdiff \| raw \| diff to current
2014-02-07	Junio C Hamano	Merge branch 'aj/ada-diff-word-pattern'	blob \| commitdiff \| raw \| diff to current
2014-02-07	Junio C Hamano	Merge branch 'nd/tag-doc'	blob \| commitdiff \| raw \| diff to current
2014-02-05	Junio C Hamano	Merge branch 'jc/maint-pull-docfix' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-05	Junio C Hamano	Merge branch 'bc/log-decoration' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-05	Junio C Hamano	Merge branch 'tr/send-email-ssl' into maint	blob \| commitdiff \| raw \| diff to current
2014-02-05	Junio C Hamano	Merge branch 'nd/transport-positive-depth-only' into...	blob \| commitdiff \| raw \| diff to current
2014-02-05	Junio C Hamano	Merge branch 'tb/repack-fix-renames' (early part)	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom