mergetool: honor diff.orderFile
[gitweb.git] / t / t4051 /
2016-07-11 Merge branch 'ao/p4-has-branch-prefix-fix' into maint
2016-07-11 Merge branch 'js/perf-on-apple' into maint
2016-07-11 Merge branch 'ak/t7800-wo-readlink' into maint
2016-07-11 Merge branch 'jk/tzoffset-fix' into maint
2016-07-11 Merge branch 'js/mingw-parameter-less-c-functions'...
2016-07-11 Merge branch 'lc/shell-default-value-noexpand' into...
2016-07-11 Merge branch 'sb/clone-shallow-passthru' into maint
2016-07-11 Merge branch 'mg/signature-doc' into maint
2016-07-11 Merge branch 'jk/bisect-show-tree' into maint
2016-07-11 Merge branch 'km/fetch-do-not-free-remote-name' into...
2016-07-11 Merge branch 'nd/graph-width-padded' into maint
2016-07-11 Merge branch 'jk/add-i-diff-compact-heuristics' into...
2016-07-11 Merge branch 'js/color-on-windows-comment'
2016-07-11 Merge branch 'mj/log-show-signature-conf'
2016-07-11 Merge branch 'js/find-commit-subject-ignore-leading...
2016-07-11 Merge branch 'jn/preformatted-doc-url'
2016-07-11 Merge branch 'jk/perf-any-version'
2016-07-11 Merge branch 'jk/ansi-color'
2016-07-11 Merge branch 'sb/submodule-clone-retry'
2016-07-11 Merge branch 'jc/send-email-skip-backup'
2016-07-06 Merge branch 'jc/t2300-setup'
2016-07-06 Merge branch 'ao/p4-has-branch-prefix-fix'
2016-07-06 Merge branch 'cb/t7810-test-label-fix'
2016-07-06 Merge branch 'sb/t5614-modernize'
2016-07-06 Merge branch 'js/perf-on-apple'
2016-07-06 Merge branch 'ak/t7800-wo-readlink'
2016-07-06 Merge branch 'jk/tzoffset-fix'
2016-07-06 Merge branch 'js/mingw-parameter-less-c-functions'
2016-07-06 Merge branch 'lc/shell-default-value-noexpand'
2016-07-06 Merge branch 'sb/clone-shallow-passthru'
2016-07-06 Merge branch 'jk/gpg-interface-cleanup'
2016-07-06 Merge branch 'mg/signature-doc'
2016-07-06 Merge branch 'nd/graph-width-padded'
2016-07-06 Merge branch 'jk/repack-keep-unreachable'
2016-07-06 Merge branch 'ew/mboxrd-format-am'
2016-07-06 Merge branch 'jk/upload-pack-hook'
2016-07-06 Merge branch 'nd/worktree-cleanup-post-head-protection'
2016-07-06 Merge branch 'jk/bisect-show-tree'
2016-07-06 Merge branch 'jk/add-i-diff-compact-heuristics'
2016-07-06 Merge branch 'lf/sideband-returns-void'
2016-07-06 Merge branch 'km/fetch-do-not-free-remote-name'
2016-07-06 Merge branch 'nd/test-lib-httpd-show-error-log-in-verbose'
2016-07-06 Merge branch 'jk/string-list-static-init'
2016-07-06 Merge branch 'jk/send-pack-stdio'
2016-07-06 Merge branch 'pb/commit-editmsg-path'
2016-07-06 Merge branch 'ep/http-curl-trace'
2016-07-06 Merge branch 'jc/deref-tag' into maint
2016-07-06 Merge branch 'pb/strbuf-read-file-doc' into maint
2016-07-06 Merge branch 'jk/fetch-prune-doc' into maint
2016-07-06 Merge branch 'pc/occurred' into maint
2016-07-06 Merge branch 'mg/cherry-pick-multi-on-unborn' into...
2016-07-06 Merge branch 'em/newer-freebsd-shells-are-fine-with...
2016-07-06 Merge branch 'lv/status-say-working-tree-not-directory...
2016-07-06 Merge branch 'nb/gnome-keyring-build' into maint
2016-07-06 Merge branch 'et/add-chmod-x' into maint
2016-07-06 Merge branch 'jk/avoid-unbounded-alloca' into maint
2016-07-06 Merge branch 'rj/compat-regex-size-max-fix' into maint
2016-07-06 Merge branch 'vs/prompt-avoid-unset-variable' into...
2016-07-06 Merge branch 'sg/reflog-past-root' into maint
2016-07-06 Merge branch 'dn/gpg-doc' into maint
2016-07-06 Merge branch 'ap/git-svn-propset-doc' into maint
2016-07-06 Merge branch 'tr/doc-tt' into maint
2016-06-27 Merge branch 'tb/complete-status'
2016-06-27 Merge branch 'mg/cherry-pick-multi-on-unborn'
2016-06-27 Merge branch 'lf/receive-pack-auto-gc-to-client'
2016-06-27 Merge branch 'em/newer-freebsd-shells-are-fine-with...
2016-06-27 Merge branch 'lv/status-say-working-tree-not-directory'
2016-06-27 Merge branch 'nb/gnome-keyring-build'
2016-06-27 Merge branch 'jc/deref-tag'
2016-06-27 Merge branch 'et/add-chmod-x'
2016-06-27 Merge branch 'jk/avoid-unbounded-alloca'
2016-06-27 Merge branch 'rj/compat-regex-size-max-fix'
2016-06-27 Merge branch 'vs/prompt-avoid-unset-variable'
2016-06-27 Merge branch 'sg/reflog-past-root'
2016-06-27 Merge branch 'pb/strbuf-read-file-doc'
2016-06-27 Merge branch 'dn/gpg-doc'
2016-06-27 Merge branch 'jk/fetch-prune-doc'
2016-06-27 Merge branch 'ap/git-svn-propset-doc'
2016-06-27 Merge branch 'tr/doc-tt'
2016-06-27 Merge branch 'pc/occurred'
2016-06-27 Merge branch 'cc/apply-introduce-state'
2016-06-27 Merge branch 'rs/xdiff-hunk-with-func-line' into maint
2016-06-20 Merge branch 'rs/xdiff-hunk-with-func-line'
2016-05-31 t4051: rewrite, add more tests