Merge branch 'tq/git-ssh-command'
[gitweb.git] / t / t7610-mergetool.sh
2014-11-19 Merge branch 'sv/submitting-final-patch'
2014-11-19 Merge branch 'sn/tutorial-status-output-example'
2014-11-19 Merge branch 'mh/doc-remote-helper-xref'
2014-11-19 Merge branch 'tb/no-relative-file-url'
2014-11-19 Merge branch 'cc/interpret-trailers'
2014-11-18 Merge branch 'jc/doc-commit-only'
2014-11-18 Merge branch 'da/difftool'
2014-11-12 Sync with 'maint'
2014-11-12 Merge branch 'jk/fetch-reflog-df-conflict'
2014-11-11 Sync with maint
2014-11-11 Merge branch 'rs/clean-menu-item-defn' into maint
2014-11-10 Sync with maint
2014-11-10 Merge branch 'js/diff-highlight-avoid-sigpipe'
2014-11-06 Merge branch 'maint'
2014-11-06 Merge branch 'nd/gitignore-trailing-whitespace'
2014-11-06 Merge branch 'tm/line-log-first-parent'
2014-11-06 Merge branch 'jk/fetch-reflog-df-conflict'
2014-11-06 Merge branch 'jk/cache-tree-protect-from-broken-libgit2'
2014-10-31 Merge branch 'jc/push-cert'
2014-10-31 Merge branch 'rs/child-process-init'
2014-10-31 Merge branch 'rs/grep-color-words'
2014-10-30 Merge git://ozlabs.org/~paulus/gitk
2014-10-29 Sync with Git 2.1.3
2014-10-29 Merge branch 'bc/asciidoc-pretty-formats-fix' into...
2014-10-29 Merge branch 'da/difftool'
2014-10-29 Merge branch 'rb/pack-window-memory-config-doc'
2014-10-29 Merge branch 'mg/lib-gpg-ro-safety'
2014-10-29 Merge branch 'dm/port2zos'
2014-10-29 Merge branch 'oc/mergetools-beyondcompare'
2014-10-29 Merge branch 'jk/prune-mtime'
2014-10-29 Merge branch 'bc/asciidoctor'
2014-10-24 Merge branch 'jc/push-cert'
2014-10-24 Merge branch 'sb/plug-transport-leak'
2014-10-24 Merge branch 'nd/dir-prep-exclude-cleanup'
2014-10-24 Merge branch 'eb/no-pthreads'
2014-10-24 Merge branch 'wk/t1304-wo-USER'
2014-10-24 Merge branch 'tb/core-filemode-doc'
2014-10-24 Merge branch 'rs/run-command-env-array'
2014-10-24 Merge branch 'po/doc-status-markup'
2014-10-24 Merge branch 'jk/pack-objects-no-bitmap-when-splitting'
2014-10-21 Merge branch 'js/completion-hide-not-a-repo'
2014-10-21 Merge branch 'da/mergetool-meld'
2014-10-21 Merge branch 'da/mergetool-temporary-directory'
2014-10-21 Merge branch 'da/mergetool-tool-help'
2014-10-21 Merge branch 'da/mergetool-tests'
2014-10-16 t7610-mergetool: add test cases for mergetool.writeToTemp
2014-10-16 t7610-mergetool: use test_config to isolate tests
2014-10-15 t7610-mergetool: prefer test_config over git config
2014-10-15 t7610-mergetool: add missing && and remove commented...
2014-10-15 t7610-mergetool: use tabs instead of a mix of tabs...
2014-10-14 Merge branch 'bc/asciidoc-pretty-formats-fix'
2014-09-30 Merge branch 'sb/merge-recursive-copy-paste-fix'
2014-09-26 Merge branch 'sb/help-unknown-command-sort-fix'
2014-09-09 Merge branch 'rs/clean-menu-item-defn'
2014-08-10 Merge branch 'master' of git://ozlabs.org/~paulus/gitk
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 'rr/rebase-autostash-fix' into maint
2014-06-25 Merge branch 'jc/shortlog-ref-exclude' into maint
2014-06-20 Merge branch 'tb/t5551-clone-notice-to-stderr'
2014-06-16 Merge branch 'rr/rebase-autostash-fix'
2014-06-09 Merge branch 'jc/shortlog-ref-exclude'
2014-05-19 Merge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-05-08 Merge branch 'cl/p4-use-diff-tree' into maint
2014-05-07 Merge branch 'cl/p4-use-diff-tree'
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-04-03 Merge branch 'mh/remove-subtree-long-pathname-fix'...
2014-04-03 Merge branch 'jc/stash-pop-not-popped' into maint
2014-03-31 Merge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-31 Merge branch 'dw/doc-status-no-longer-shows-pound-prefix'
2014-03-25 Merge branch 'dm/configure-iconv-locale-charset'
2014-03-25 Merge branch 'mh/remove-subtree-long-pathname-fix'
2014-03-25 Merge branch 'cp/am-patch-format-doc'
2014-03-21 Merge branch 'es/sh-i18n-envsubst'
2014-03-21 Merge branch 'jc/stash-pop-not-popped'
2014-03-18 Merge branch 'jk/commit-dates-parsing-fix' into maint
2014-03-18 Merge branch 'tr/diff-submodule-no-reuse-worktree'...
2014-03-18 Merge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18 Merge branch 'bk/refresh-missing-ok-in-merge-recursive...
2014-03-18 Merge branch 'jk/config-path-include-fix' into maint
2014-03-18 Merge branch 'nd/diff-quiet-stat-dirty' into maint
2014-03-18 Merge branch 'mh/simplify-cache-tree-find'
2014-03-18 Merge branch 'jn/branch-lift-unnecessary-name-length...
2014-03-18 Merge branch 'nd/sha1-file-delta-stack-leakage-fix'
2014-03-14 Merge branch 'sh/write-pack-file-warning-message-fix'
2014-03-14 Merge branch 'jk/commit-dates-parsing-fix'
2014-03-14 Merge branch 'jh/note-trees-record-blobs'
2014-03-14 Merge branch 'tr/diff-submodule-no-reuse-worktree'
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-03-03 Merge branch 'sh/write-pack-file-warning-message-fix...
2014-02-27 Merge branch 'nd/test-rename-reset'
2014-02-27 Merge branch 'bs/stdio-undef-before-redef'
next