Sync with maint
[gitweb.git] / mergetools / examdiff
2016-05-03 Sync with maint
2016-05-03 Merge branch 'nf/mergetool-prompt'
2016-05-03 Merge branch 'jd/send-email-to-whom'
2016-05-03 Merge branch 'rt/string-list-lookup-cleanup'
2016-05-03 Merge branch 'jk/fix-attribute-macro-in-2.5'
2016-05-03 Merge branch 'sg/test-lib-simplify-expr-away'
2016-05-03 Merge branch 'nd/remove-unused'
2016-05-03 Merge branch 'js/name-rev-use-oldest-ref'
2016-05-03 Merge branch 'en/merge-fixes'
2016-05-02 Sync with maint
2016-04-29 Sync with 2.8.2
2016-04-29 Merge branch 'st/verify-tag'
2016-04-29 Merge branch 'js/win32-mmap'
2016-04-29 Merge branch 'jc/merge-refuse-new-root'
2016-04-29 Merge branch 'jk/push-client-deadlock-fix'
2016-04-29 Merge branch 'js/replace-edit-use-editor-configuration'
2016-04-29 Merge branch 'sb/mv-submodule-fix'
2016-04-29 Merge branch 'da/user-useconfigonly'
2016-04-25 Sync with maint
2016-04-25 Merge branch 'sb/submodule-path-misc-bugs'
2016-04-25 Merge branch 'en/merge-trivial-fix'
2016-04-25 Merge branch 'en/merge-octopus-fix'
2016-04-25 Merge branch 'dt/pre-refs-backend'
2016-04-25 Merge branch 'jc/rerere-multi'
2016-04-22 Merge branch 'ad/cygwin-wants-rename'
2016-04-22 Merge branch 'jk/use-write-script-more'
2016-04-22 Merge branch 'jk/do-not-printf-NULL'
2016-04-22 Merge branch 'jc/http-socks5h'
2016-04-22 Merge branch 'ky/imap-send-openssl-1.1.0'
2016-04-22 Merge branch 'ky/imap-send'
2016-04-22 Merge branch 'jc/xstrfmt-null-with-prec-0'
2016-04-22 Merge branch 'ad/commit-have-m-option'
2016-04-22 Merge branch 'ew/send-email-drop-data-dumper'
2016-04-22 Merge branch 'ew/send-email-readable-message-id'
2016-04-22 Merge branch 'sb/submodule-helper-clone-regression...
2016-04-18 Merge branch 'jk/branch-shortening-funny-symrefs'
2016-04-18 Merge branch 'ky/branch-m-worktree'
2016-04-15 Merge branch 'maint'
2016-04-13 Merge branch 'tb/blame-force-read-cache-to-workaround...
2016-04-13 Merge branch 'mg/complete-cherry-mark-to-log'
2016-04-13 Merge branch 'ep/trace-doc-sample-fix'
2016-04-13 Merge branch 'jc/makefile-redirection-stderr'
2016-04-13 Merge branch 'lt/pretty-expand-tabs'
2016-04-13 Merge branch 'mj/pull-rebase-autostash'
2016-04-13 Merge branch 'jn/mergetools-examdiff'
2016-04-04 mergetools: add support for ExamDiff