mergetool: honor diff.orderFile
[git] / attr.c
2016-07-11  Junio C HamanoMerge branch 'jk/ansi-color'
2016-07-11  Junio C HamanoMerge branch 'jc/send-email-skip-backup'
2016-07-06  Junio C HamanoMerge branch 'ao/p4-has-branch-prefix-fix'
2016-07-06  Junio C HamanoMerge branch 'cb/t7810-test-label-fix'
2016-07-06  Junio C HamanoMerge branch 'sb/t5614-modernize'
2016-07-06  Junio C HamanoMerge branch 'ak/t7800-wo-readlink'
2016-07-06  Junio C HamanoMerge branch 'jk/tzoffset-fix'
2016-07-06  Junio C HamanoMerge branch 'lc/shell-default-value-noexpand'
2016-07-06  Junio C HamanoMerge branch 'sb/clone-shallow-passthru'
2016-07-06  Junio C HamanoMerge branch 'jk/bisect-show-tree'
2016-07-06  Junio C HamanoMerge branch 'jc/deref-tag' into maint
2016-07-06  Junio C HamanoMerge branch 'pb/strbuf-read-file-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'jk/fetch-prune-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'mg/cherry-pick-multi-on-unborn' into...
2016-07-06  Junio C HamanoMerge branch 'em/newer-freebsd-shells-are-fine-with...
2016-07-06  Junio C HamanoMerge branch 'nb/gnome-keyring-build' into maint
2016-07-06  Junio C HamanoMerge branch 'jk/avoid-unbounded-alloca' into maint
2016-07-06  Junio C HamanoMerge branch 'vs/prompt-avoid-unset-variable' into...
2016-07-06  Junio C HamanoMerge branch 'dn/gpg-doc' into maint
2016-07-06  Junio C HamanoMerge branch 'ap/git-svn-propset-doc' into maint
2016-06-27  Junio C HamanoMerge branch 'tb/complete-status'
2016-06-27  Junio C HamanoMerge branch 'mg/cherry-pick-multi-on-unborn'
2016-06-27  Junio C HamanoMerge branch 'em/newer-freebsd-shells-are-fine-with...
2016-06-27  Junio C HamanoMerge branch 'nb/gnome-keyring-build'
2016-06-27  Junio C HamanoMerge branch 'jc/deref-tag'
2016-06-27  Junio C HamanoMerge branch 'jk/avoid-unbounded-alloca'
2016-06-27  Junio C HamanoMerge branch 'vs/prompt-avoid-unset-variable'
2016-06-27  Junio C HamanoMerge branch 'pb/strbuf-read-file-doc'
2016-06-27  Junio C HamanoMerge branch 'dn/gpg-doc'
2016-06-27  Junio C HamanoMerge branch 'jk/fetch-prune-doc'
2016-06-27  Junio C HamanoMerge branch 'ap/git-svn-propset-doc'
2016-06-27  Junio C HamanoMerge branch 'rs/xdiff-hunk-with-func-line' into maint
2016-06-27  Junio C HamanoMerge branch 'jk/rev-list-count-with-bitmap' into maint
2016-06-27  Junio C HamanoMerge branch 'ew/daemon-socket-keepalive' into maint
2016-06-20  Junio C HamanoMerge branch 'rs/xdiff-hunk-with-func-line'
2016-06-20  Junio C HamanoMerge branch 'jk/rev-list-count-with-bitmap'
2016-06-20  Junio C HamanoMerge branch 'ew/daemon-socket-keepalive'
2016-06-13  Junio C HamanoMerge branch 'jk/parseopt-string-list' into jk/string...
2016-06-10  Junio C HamanoMerge branch 'jk/diff-compact-heuristic'
2016-06-06  Junio C HamanoMerge branch 'tb/core-eol-fix' into maint
2016-06-06  Junio C HamanoMerge branch 'ar/diff-args-osx-precompose' into maint
2016-06-03  Junio C HamanoMerge branch 'rs/apply-name-terminate'
2016-06-03  Junio C HamanoMerge branch 'rs/patch-id-use-skip-prefix'
2016-06-03  Junio C HamanoMerge branch 'pa/cherry-pick-doc-typo'
2016-06-03  Junio C HamanoMerge branch 'js/rebase-i-dedup-call-to-rerere'
2016-05-31  Junio C HamanoMerge branch 'sb/submodule-deinit-all' into maint
2016-05-31  Junio C HamanoMerge branch 'bn/http-cookiefile-config' into maint
2016-05-31  Junio C HamanoMerge branch 'jk/test-send-sh-x-trace-elsewhere' into...
2016-05-31  Junio C HamanoMerge branch 'js/name-rev-use-oldest-ref' into maint
2016-05-31  Junio C HamanoMerge branch 'jk/cat-file-buffered-batch-all'
2016-05-30  Junio C HamanoMerge branch 'ak/t0008-ksh88-workaround'
2016-05-30  Junio C HamanoMerge branch 'rj/log-decorate-auto'
2016-05-26  Junio C HamanoMerge branch 'ls/travis-build-doc' into maint
2016-05-26  Junio C HamanoMerge branch 'jc/fsck-nul-in-commit' into maint
2016-05-26  Junio C HamanoMerge branch 'js/windows-dotgit' into maint
2016-05-26  Junio C HamanoMerge branch 'kf/gpg-sig-verification-doc' into maint
2016-05-26  Junio C HamanoMerge branch 'lp/typofixes' into maint
2016-05-26  Junio C HamanoMerge branch 'sb/z-is-gnutar-ism' into maint
2016-05-26  Junio C HamanoMerge branch 'va/i18n-misc-updates' into maint
2016-05-26  Junio C HamanoMerge branch 'bn/config-doc-tt-varnames' into maint
2016-05-26  Junio C HamanoMerge branch 'nd/remote-plural-ours-plus-theirs' into...
2016-05-26  Junio C HamanoMerge branch 'ak/t4151-ls-files-could-be-empty' into...
2016-05-26  Junio C HamanoMerge branch 'jc/test-seq' into maint
2016-05-26  Junio C HamanoMerge branch 'tb/t5601-sed-fix' into maint
2016-05-26  Junio C HamanoMerge branch 'va/i18n-remote-comment-to-align' into...
2016-05-26  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix' into maint
2016-05-26  Junio C HamanoMerge branch 'maint-2.7' into maint
2016-05-26  Junio C HamanoMerge branch 'jk/war-on-sprintf' into maint-2.7
2016-05-23  Junio C HamanoMerge branch 'jc/rerere-multi'
2016-05-23  Junio C HamanoMerge branch 'ar/diff-args-osx-precompose'
2016-05-23  Junio C HamanoMerge branch 'jc/doc-lint'
2016-05-23  Junio C HamanoMerge branch 'xy/format-patch-base'
2016-05-23  Junio C HamanoMerge branch 'tb/core-eol-fix'
2016-05-23  Junio C HamanoMerge branch 'ss/commit-dry-run-resolve-merge-to-no-op'
2016-05-18  Junio C HamanoMerge branch 'jk/push-client-deadlock-fix'
2016-05-18  Junio C HamanoMerge branch 'sb/misc-cleanups' into HEAD
2016-05-18  Junio C HamanoMerge branch 'sb/clean-test-fix' into HEAD
2016-05-18  Junio C HamanoMerge branch 'rn/glossary-typofix' into HEAD
2016-05-18  Junio C HamanoMerge branch 'jk/fix-attribute-macro-in-2.5' into HEAD
2016-05-18  Junio C HamanoMerge branch 'sk/gitweb-highlight-encoding' into HEAD
2016-05-18  Junio C HamanoMerge branch 'ls/travis-submitting-patches' into HEAD
2016-05-18  Junio C HamanoMerge branch 'js/close-packs-before-gc' into HEAD
2016-05-18  Junio C HamanoMerge branch 'ls/p4-lfs' into HEAD
2016-05-18  Junio C HamanoMerge branch 'ls/p4-lfs-test-fix-2.7.0' into HEAD
2016-05-18  Junio C HamanoMerge branch 'nf/mergetool-prompt' into HEAD
2016-05-18  Junio C HamanoMerge branch 'jd/send-email-to-whom' into HEAD
2016-05-18  Junio C HamanoMerge branch 'jk/push-client-deadlock-fix' into HEAD
2016-05-18  Junio C HamanoMerge branch 'sb/mv-submodule-fix' into HEAD
2016-05-18  Junio C HamanoMerge branch 'da/user-useconfigonly' into HEAD
2016-05-17  Junio C HamanoMerge branch 'kf/gpg-sig-verification-doc'
2016-05-17  Junio C HamanoMerge branch 'js/windows-dotgit'
2016-05-17  Junio C HamanoMerge branch 'va/mailinfo-doc-typofix'
2016-05-17  Junio C HamanoMerge branch 'jk/test-send-sh-x-trace-elsewhere'
2016-05-17  Junio C HamanoMerge branch 'js/http-custom-headers'
2016-05-17  Junio C HamanoMerge branch 'jc/fsck-nul-in-commit'
2016-05-17  Junio C HamanoMerge branch 'ls/travis-build-doc'
2016-05-17  Junio C HamanoMerge branch 'jc/ll-merge-internal'
2016-05-17  Junio C HamanoMerge branch 'va/i18n-remote-comment-to-align'
2016-05-17  Junio C HamanoMerge branch 'tb/t5601-sed-fix'
2016-05-17  Junio C HamanoMerge branch 'nd/error-errno'
next