projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Merge branch 'da/mergetool-delete-delete-conflict'
[git] / mergetools /
2016-04-06  Junio C HamanoMerge branch 'sb/submodule-parallel-update' tree | commitdiff
2016-04-06  Junio C HamanoMerge branch 'ss/exc-flag-is-a-collection-of-bits' tree | commitdiff
2016-04-03  Junio C HamanoMerge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath' tree | commitdiff
2016-04-03  Junio C HamanoMerge branch 'jc/maint-index-pack-keep' tree | commitdiff
2016-03-24  Junio C HamanoMerge branch 'sb/submodule-module-list-pathspec-fix' tree | commitdiff
2016-03-21  Junio C HamanoMerge branch 'mm/doc-hooks-linkgit-fix' into maint tree | commitdiff
2016-03-21  Junio C HamanoMerge branch 'es/st-add4-gcc-4.2-workaround' into maint tree | commitdiff
2016-03-21  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk tree | commitdiff
2016-03-17  Junio C HamanoSync with Git 2.6.6 tree | commitdiff
2016-03-17  Junio C HamanoMerge branch 'maint-2.4' into maint-2.5 tree | commitdiff
2016-03-16  Junio C HamanoMerge branch 'jc/sane-grep' tree | commitdiff
2016-03-16  Junio C HamanoMerge branch 'cn/deprecate-ssh-git-url' tree | commitdiff
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.6' into jk/path... tree | commitdiff
2016-03-16  Junio C HamanoMerge branch 'jk/path-name-safety-2.4' into jk/path... tree | commitdiff
2016-03-14  Junio C HamanoMerge branch 'mg/wt-status-mismarked-i18n' tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'ma/update-hooks-sample-typofix' into... tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'dt/initial-ref-xn-commit-doc' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'ps/plug-xdl-merge-leak' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'ak/git-strip-extension-from-dashed-comman... tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'sb/submodule-module-list-fix' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test' into... tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'mm/push-simple-doc' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'jk/tighten-alloc' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'jk/more-comments-on-textconv' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'jk/no-diff-emit-common' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'jc/am-i-v-fix' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'nd/git-common-dir-fix' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs' into... tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'ps/config-error' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'mg/work-tree-tests' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'sp/remote-curl-ssl-strerror' into maint tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'jx/http-no-proxy' tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'jc/exclusion-doc' tree | commitdiff
2016-03-10  Junio C HamanoMerge branch 'js/close-packs-before-gc' tree | commitdiff
2016-03-04  Junio C HamanoMerge branch 'nd/clear-gitenv-upon-use-of-alias' tree | commitdiff
2016-03-04  Junio C HamanoMerge branch 'sb/submodule-parallel-fetch' tree | commitdiff
2016-03-04  Junio C HamanoMerge branch 'jk/tighten-alloc' tree | commitdiff
2016-03-04  Junio C HamanoMerge branch 'jk/pack-idx-corruption-safety' tree | commitdiff
2016-03-04  Junio C HamanoMerge branch 'js/mingw-tests' tree | commitdiff
2016-03-03  Junio C HamanoMerge branch 'jc/maint-index-pack-keep' into jc/index... tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'ma/update-hooks-sample-typofix' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'ls/makefile-cflags-developer-tweak' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'dt/initial-ref-xn-commit-doc' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'fa/merge-recursive-no-rename' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'sb/submodule-module-list-fix' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'tb/conversion' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'jk/grep-binary-workaround-in-test' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'ps/plug-xdl-merge-leak' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'mm/push-simple-doc' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'ps/config-error' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'mg/work-tree-tests' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'ls/config-origin' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'jk/tighten-alloc' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'jk/more-comments-on-textconv' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'jk/no-diff-emit-common' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'ak/git-strip-extension-from-dashed-command' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'ak/extract-argv0-last-dir-sep' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'kn/ref-filter-atom-parsing' tree | commitdiff
2016-02-26  Junio C HamanoMerge branch 'tg/git-remote' tree | commitdiff
2016-02-24  Junio C HamanoMerge branch 'jc/am-i-v-fix' tree | commitdiff
2016-02-24  Junio C HamanoMerge branch 'nd/worktree-add-B' tree | commitdiff
2016-02-24  Junio C HamanoMerge branch 'nd/exclusion-regression-fix' tree | commitdiff
2016-02-24  Junio C HamanoMerge branch 'ce/https-public-key-pinning' tree | commitdiff
2016-02-24  Junio C HamanoMerge branch 'bc/http-empty-auth' tree | commitdiff
2016-02-24  Junio C HamanoMerge branch 'sp/remote-curl-ssl-strerror' tree | commitdiff
2016-02-24  Junio C HamanoMerge branch 'jk/lose-name-path' tree | commitdiff
2016-02-24  Junio C HamanoMerge branch 'ew/force-ipv4' tree | commitdiff
2016-02-24  Junio C HamanoMerge branch 'nd/git-common-dir-fix' tree | commitdiff
2016-02-24  Junio C HamanoMerge branch 'nd/dwim-wildcards-as-pathspecs' tree | commitdiff
2016-02-22  Junio C HamanoMerge branch 'js/git-remote-add-url-insteadof-test' tree | commitdiff
2016-02-22  Junio C HamanoMerge branch 'jk/config-include' tree | commitdiff
2016-02-22  Junio C HamanoMerge branch 'ew/connect-verbose' tree | commitdiff
2016-02-22  Junio C HamanoMerge branch 'nd/ita-cleanup' into maint tree | commitdiff
2016-02-22  Junio C HamanoMerge branch 'pw/completion-stash' into maint tree | commitdiff
2016-02-22  Junio C HamanoMerge branch 'mm/clean-doc-fix' into maint tree | commitdiff
2016-02-22  Junio C HamanoMerge branch 'dw/mergetool-vim-window-shuffle' into... tree | commitdiff
2016-02-22  Junio C HamanoMerge branch 'pw/completion-stash' tree | commitdiff
2016-02-17  Junio C HamanoMerge branch 'maint' tree | commitdiff
2016-02-17  Junio C HamanoMerge branch 'dw/mergetool-vim-window-shuffle' tree | commitdiff
2016-02-17  Junio C HamanoMerge branch 'jk/rerere-xsnprintf' tree | commitdiff
2016-02-12  Dickson Wongmergetool: reorder vim/gvim buffers in three-way diffs tree | commitdiff
2016-02-10  Junio C HamanoMerge branch 'wp/sha1-name-negative-match' tree | commitdiff
2016-02-05  Junio C HamanoMerge branch 'ss/clone-depth-single-doc' into maint tree | commitdiff
2016-02-05  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix' into... tree | commitdiff
2016-02-05  Junio C HamanoMerge branch 'ew/for-each-ref-doc' into maint tree | commitdiff
2016-02-05  Junio C HamanoMerge branch 'ss/user-manual' into maint tree | commitdiff
2016-02-05  Junio C HamanoMerge branch 'jk/sanity' into maint tree | commitdiff
2016-02-05  Junio C HamanoMerge branch 'ho/gitweb-squelch-undef-warning' into... tree | commitdiff
2016-02-05  Junio C HamanoMerge branch 'nd/exclusion-regression-fix' into maint tree | commitdiff
2016-02-05  Junio C HamanoMerge branch 'ew/send-email-mutt-alias-fix' into maint tree | commitdiff
2016-02-05  Junio C HamanoMerge branch 'nd/dir-exclude-cleanup' into maint tree | commitdiff
2016-02-05  Junio C HamanoMerge branch 'nd/stop-setenv-work-tree' into maint tree | commitdiff
2016-01-29  Junio C HamanoMerge branch 'jk/sanity' tree | commitdiff
2016-01-20  Junio C HamanoMerge branch 'tg/grep-no-index-fallback' tree | commitdiff
2016-01-20  Junio C HamanoMerge branch 'ho/gitweb-squelch-undef-warning' tree | commitdiff
2016-01-20  Junio C HamanoMerge branch 'ss/clone-depth-single-doc' tree | commitdiff
2016-01-20  Junio C HamanoMerge branch 'nd/exclusion-regression-fix' tree | commitdiff
2016-01-20  Junio C HamanoMerge branch 'sg/t6050-failing-editor-test-fix' tree | commitdiff
next
Unnamed repository; edit this file 'description' to name the repository.