OSDN Git Service

Git 2.11.2
[git-core/git.git] / mergetools /
2017-05-05 Junio C HamanoMerge branch 'maint-2.10' into maint-2.11
2017-05-05 Junio C HamanoMerge branch 'maint-2.8' into maint-2.9
2017-05-05 Junio C HamanoMerge branch 'maint-2.6' into maint-2.7
2017-05-05 Junio C HamanoMerge branch 'maint-2.4' into maint-2.5
2017-02-02 Junio C HamanoMerge branch 'ws/request-pull-code-cleanup' into maint
2017-02-02 Junio C HamanoMerge branch 'jk/execv-dashed-external' into maint
2017-01-31 Junio C HamanoMerge branch 'js/mingw-isatty' into maint
2017-01-31 Junio C HamanoMerge branch 'jk/coding-guidelines-update' into maint
2017-01-31 Junio C HamanoMerge branch 'js/exec-path-coverity-workaround' into...
2017-01-31 Junio C HamanoMerge branch 'ad/bisect-terms' into maint
2017-01-31 Junio C HamanoMerge branch 'jk/grep-e-could-be-extended-beyond-posix...
2017-01-31 Junio C HamanoMerge branch 'km/branch-get-push-while-detached' into...
2017-01-31 Junio C HamanoMerge branch 'jk/rebase-i-squash-count-fix' into maint
2017-01-31 Junio C HamanoMerge branch 'jk/blame-fixes' into maint
2017-01-31 Junio C HamanoMerge branch 'jk/archive-zip-userdiff-config' into...
2017-01-31 Junio C HamanoMerge branch 'dt/disable-bitmap-in-auto-gc' into maint
2017-01-31 Junio C HamanoMerge branch 'nd/config-misc-fixes' into maint
2017-01-31 Junio C HamanoMerge branch 'jc/abbrev-autoscale-config' into maint
2017-01-31 Junio C HamanoMerge branch 'mh/fast-import-notes-fix-new' into maint
2017-01-31 Junio C HamanoMerge branch 'jc/compression-config' into maint
2017-01-31 Junio C HamanoMerge branch 'ew/svn-fixes' into maint
2017-01-31 Junio C HamanoMerge branch 'jk/make-tags-find-sources-tweak' into...
2017-01-31 Junio C HamanoMerge branch 'jc/latin-1' into maint
2017-01-17 Junio C HamanoMerge branch 'mm/gc-safety-doc' into maint
2017-01-17 Junio C HamanoMerge branch 'mm/push-social-engineering-attack-doc...
2017-01-17 Junio C HamanoMerge branch 'jt/fetch-no-redundant-tag-fetch-map'...
2017-01-17 Junio C HamanoMerge branch 'ls/filter-process' into maint
2017-01-17 Junio C HamanoMerge branch 'kh/tutorial-grammofix' into maint
2017-01-17 Junio C HamanoMerge branch 'lr/doc-fix-cet' into maint
2017-01-17 Junio C HamanoMerge branch 'sb/t3600-cleanup' into maint
2017-01-17 Junio C HamanoMerge branch 'jk/readme-gmane-is-no-more' into maint
2017-01-17 Junio C HamanoMerge branch 'sb/unpack-trees-grammofix' into maint
2017-01-17 Junio C HamanoMerge branch 'ls/t0021-fixup' into maint
2017-01-17 Junio C HamanoMerge branch 'ak/lazy-prereq-mktemp' into maint
2017-01-17 Junio C HamanoMerge branch 'nd/qsort-in-merge-recursive' into maint
2017-01-17 Junio C HamanoMerge branch 'dt/smart-http-detect-server-going-away...
2017-01-17 Junio C HamanoMerge branch 'mk/mingw-winansi-ttyname-termination...
2017-01-17 Junio C HamanoMerge branch 'gv/p4-multi-path-commit-fix' into maint
2017-01-17 Junio C HamanoMerge branch 'jk/difftool-in-subdir' into maint
2017-01-17 Junio C HamanoMerge branch 'ld/p4-compare-dir-vs-symlink' into maint
2017-01-17 Junio C HamanoMerge branch 'jc/push-default-explicit' into maint
2017-01-17 Junio C HamanoMerge branch 'jt/mailinfo-fold-in-body-headers' into...
2017-01-17 Junio C HamanoMerge branch 'jk/index-pack-wo-repo-from-stdin' into...
2017-01-17 Junio C HamanoMerge branch 'jk/parseopt-usage-msg-opt' into maint
2017-01-17 Junio C HamanoMerge branch 'jk/quote-env-path-list-component' into...
2017-01-17 Junio C HamanoMerge branch 'nd/shallow-fixup' into maint
2017-01-17 Junio C HamanoMerge branch 'sb/sequencer-abort-safety' into maint
2017-01-17 Junio C HamanoMerge branch 'da/mergetool-xxdiff-hotkey' into maint
2017-01-17 Junio C HamanoMerge branch 'jc/pull-rebase-ff' into maint
2017-01-17 Junio C HamanoMerge branch 'js/normalize-path-copy-ceil' into maint
2017-01-17 Junio C HamanoMerge branch 'ak/commit-only-allow-empty' into maint
2017-01-17 Junio C HamanoMerge branch 'da/difftool-dir-diff-fix' into maint
2017-01-17 Junio C HamanoMerge branch 'jb/diff-no-index-no-abbrev' into maint
2017-01-17 Junio C HamanoMerge branch 'jk/stash-disable-renames-internally'...
2017-01-17 Junio C HamanoMerge branch 'jk/http-walker-limit-redirect' into maint
2017-01-17 Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf...
2017-01-17 Junio C HamanoMerge branch 'ls/p4-empty-file-on-lfs' into maint
2017-01-17 Junio C HamanoMerge branch 'da/mergetool-trust-exit-code' into maint
2017-01-17 Junio C HamanoMerge branch 'bb/unicode-9.0' into maint
2016-12-12 David Aguilarmergetools: fix xxdiff hotkeys
2016-11-29 Junio C HamanoMerge branch 'tk/diffcore-delta-remove-unused' into...
2016-11-29 Junio C HamanoMerge branch 'ps/common-info-doc' into maint
2016-11-29 Junio C HamanoMerge branch 'sc/fmt-merge-msg-doc-markup-fix' into...
2016-11-29 Junio C HamanoMerge branch 'rs/commit-pptr-simplify' into maint
2016-11-29 Junio C HamanoMerge branch 'jk/rebase-config-insn-fmt-docfix' into...
2016-11-29 Junio C HamanoMerge branch 'jk/daemon-path-ok-check-truncation' into...
2016-11-29 Junio C HamanoMerge branch 'mm/send-email-cc-cruft-after-address...
2016-11-29 David Aguilarmergetools/vimdiff: trust Vim's exit code
2016-11-29 David Aguilarmergetool: honor mergetool.$tool.trustExitCode for...
2016-11-23 Junio C HamanoMerge branch 'js/rebase-i-commentchar-fix'
2016-11-23 Junio C HamanoMerge branch 'jc/for-each-ref-head-segfault-fix'
2016-11-17 Junio C HamanoMerge branch 'tk/diffcore-delta-remove-unused'
2016-11-11 Junio C HamanoMerge branch 'ps/common-info-doc'
2016-10-31 Junio C HamanoMerge branch 'sc/fmt-merge-msg-doc-markup-fix'
2016-10-31 Junio C HamanoMerge branch 'rs/commit-pptr-simplify'
2016-10-31 Junio C HamanoMerge branch 'jk/rebase-config-insn-fmt-docfix'
2016-10-28 Junio C HamanoMerge branch 'rs/pretty-format-color-doc-fix' into...
2016-10-28 Junio C HamanoMerge branch 'js/reset-usage' into maint
2016-10-28 Junio C HamanoMerge branch 'po/fix-doc-merge-base-illustration' into...
2016-10-28 Junio C HamanoMerge branch 'jk/tap-verbose-fix' into maint
2016-10-28 Junio C HamanoMerge branch 'jk/tighten-alloc' into maint
2016-10-28 Junio C HamanoMerge branch 'jk/merge-base-fork-point-without-reflog...
2016-10-28 Junio C HamanoMerge branch 'sb/submodule-config-doc-drop-path' into...
2016-10-28 Junio C HamanoMerge branch 'nd/commit-p-doc' into maint
2016-10-28 Junio C HamanoMerge branch 'jk/clone-copy-alternates-fix' into maint
2016-10-28 Junio C HamanoMerge branch 'ak/curl-imap-send-explicit-scheme' into...
2016-10-28 Junio C HamanoMerge branch 'js/regexec-buf' into maint
2016-10-28 Junio C HamanoMerge branch 'rs/c-auto-resets-attributes' into maint
2016-10-28 Junio C HamanoMerge branch 'yk/git-tag-remove-mention-of-old-layout...
2016-10-27 Junio C HamanoMerge branch 'jk/daemon-path-ok-check-truncation'
2016-10-27 Junio C HamanoMerge branch 'sb/submodule-ignore-trailing-slash'
2016-10-26 Junio C HamanoMerge branch 'po/fix-doc-merge-base-illustration'
2016-10-26 Junio C HamanoMerge branch 'jk/tap-verbose-fix'
2016-10-26 Junio C HamanoMerge branch 'mm/send-email-cc-cruft-after-address'
2016-10-26 Junio C HamanoMerge branch 'yk/git-tag-remove-mention-of-old-layout...
2016-10-26 Junio C HamanoMerge branch 'jk/tighten-alloc'
2016-10-26 Junio C HamanoMerge branch 'jk/merge-base-fork-point-without-reflog'
2016-10-26 Junio C HamanoMerge branch 'mm/credential-libsecret'
2016-10-26 Junio C HamanoMerge branch 'jc/ws-error-highlight'
2016-10-20 Junio C HamanoMerge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui
next