Merge branch 'jk/complete-merge-pull' into next
[git] / mergetools / vimdiff
2014-06-10  Junio C HamanoMerge branch 'jk/complete-merge-pull' into next
2014-06-10  Junio C HamanoMerge branch 'bg/xcalloc-nmemb-then-size' into next
2014-06-10  Junio C HamanoMerge branch 'jl/status-added-submodule-is-never-ignore...
2014-06-10  Junio C HamanoMerge branch 'cb/byte-order' into next
2014-06-10  Junio C HamanoMerge branch 'jk/strbuf-tolower' into next
2014-06-10  Junio C HamanoMerge branch 'jk/daemon-tolower' into next
2014-06-10  Junio C HamanoMerge branch 'as/pretty-truncate' into next
2014-06-10  Junio C HamanoMerge branch 'jk/diff-follow-must-take-one-pathspec...
2014-06-10  Junio C HamanoMerge branch 'sk/windows-unc-path' into next
2014-06-10  Junio C HamanoMerge branch 'rr/rebase-autostash-fix' into next
2014-06-10  Junio C HamanoMerge branch 'jk/report-fail-to-read-objects-better...
2014-06-10  Junio C HamanoMerge branch 'jk/diff-files-assume-unchanged' into...
2014-06-10  Junio C HamanoMerge branch 'jk/argv-array-for-child-process' into...
2014-06-10  Junio C HamanoMerge branch 'sk/wincred' into next
2014-06-10  Junio C HamanoMerge branch 'jk/do-not-run-httpd-tests-as-root' into...
2014-06-10  Junio C HamanoMerge branch 'cc/replace-edit' into next
2014-06-10  Junio C HamanoMerge branch 'mt/patch-id-stable' (early part) into...
2014-06-09  Junio C HamanoMerge branch 'jc/shortlog-ref-exclude'
2014-06-09  Junio C HamanoMerge branch 'mn/sideband-no-ansi'
2014-06-09  Junio C HamanoMerge branch 'rs/mailinfo-header-cmp'
2014-06-09  Junio C HamanoMerge branch 'pb/trim-trailing-spaces'
2014-06-09  Junio C HamanoMerge branch 'na/no-http-test-in-the-middle'
2014-06-09  Junio C HamanoMerge branch 'jc/rev-parse-argh-dashed-multi-words'
2014-06-09  Junio C HamanoMerge branch 'lt/request-pull'
2014-06-06  Junio C HamanoMerge branch 'ss/howto-manage-trunk'
2014-06-06  Junio C HamanoMerge branch 'mc/git-p4-prepare-p4-only'
2014-06-06  Junio C HamanoMerge branch 'jn/test-lint-unmoor'
2014-06-06  Junio C HamanoMerge branch 'ep/shell-assign-and-export-vars'
2014-06-06  Junio C HamanoMerge branch 'jj/command-line-adjective'
2014-06-06  Junio C HamanoMerge branch 'jc/coding-guidelines'
2014-06-06  Junio C HamanoMerge branch 'nd/status-auto-comment-char'
2014-06-06  Junio C HamanoMerge branch 'mt/rebase-i-keep-empty-test'
2014-06-06  Junio C HamanoMerge branch 'mk/show-s-no-extra-blank-line-for-merges'
2014-06-06  Junio C HamanoMerge branch 'sk/spawn-less-case-insensitively-from...
2014-06-06  Junio C HamanoMerge branch 'jd/subtree'
2014-06-06  Junio C HamanoMerge branch 'wk/doc-clarify-upstream'
2014-06-06  Junio C HamanoMerge branch 'tb/unicode-6.3-zero-width'
2014-06-06  Junio C HamanoMerge branch 'jk/index-pack-report-missing'
2014-06-06  Junio C HamanoMerge branch 'bc/blame-crlf-test'
2014-06-06  Junio C HamanoMerge branch 'sk/submodules-absolute-path-on-windows'
2014-06-06  Junio C HamanoMerge branch 'dk/blame-reorg'
2014-06-06  Junio C HamanoMerge branch 'wg/svn-fe-style-fixes'
2014-06-06  Junio C HamanoMerge branch 'jn/contrib-remove-vim'
2014-06-06  Junio C HamanoMerge branch 'jn/contrib-remove-diffall'
2014-06-06  Junio C HamanoMerge branch 'dt/merge-recursive-case-insensitive'
2014-06-06  Junio C HamanoMerge branch 'rs/reflog-exists'
2014-06-06  Junio C HamanoMerge branch 'tg/tag-state-tag-name-in-editor-hints'
2014-06-06  Junio C HamanoMerge branch 'jk/grep-tell-run-command-to-cd-when-runni...
2014-06-06  Junio C HamanoMerge branch 'fc/status-printf-squelch-format-zero...
2014-06-06  Junio C HamanoMerge branch 'jk/squelch-compiler-warning-from-funny...
2014-06-06  Junio C HamanoMerge branch 'dk/raise-core-deltabasecachelimit'
2014-06-06  Junio C HamanoMerge branch 'tl/relax-in-poll-emulation'
2014-06-06  Junio C HamanoMerge branch 'jk/utf8-switch-between-nfd-and-nfc'
2014-06-06  Junio C HamanoMerge branch 'da/imap-send-use-credential-helper'
2014-06-06  Junio C HamanoMerge branch 'je/pager-do-not-recurse'
2014-06-06  Junio C HamanoMerge branch 'jk/commit-C-pick-empty'
2014-06-06  Junio C HamanoMerge branch 'mm/pager-less-sans-S'
2014-06-03  Junio C HamanoMerge branch 'sk/msvc-dynlink-crt'
2014-06-03  Junio C HamanoMerge branch 'ew/config-protect-mode'
2014-06-03  Junio C HamanoMerge branch 'bg/strbuf-trim'
2014-06-03  Junio C HamanoMerge branch 'jk/commit-date-approxidate'
2014-06-03  Junio C HamanoMerge branch 'ep/shell-command-substitution'
2014-06-03  Junio C HamanoMerge branch 'fc/rerere-conflict-style'
2014-06-03  Junio C HamanoMerge branch 'dt/api-doc-setup-gently'
2014-06-03  Junio C HamanoMerge branch 'fc/mergetool-prompt'
2014-06-03  Junio C HamanoMerge branch 'mm/mediawiki-encoding-fix'
2014-06-03  Junio C HamanoMerge branch 'sk/tag-contains-wo-recursion'
2014-06-03  Junio C HamanoMerge branch 'ef/send-email-absolute-path-to-the-command'
2014-06-03  Junio C HamanoMerge branch 'jx/blame-align-relative-time'
2014-06-03  Junio C HamanoMerge branch 'lr/git-run-setup-gently'
2014-06-03  Junio C HamanoMerge branch 'fc/mergetools-vimdiff3'
2014-05-19  Junio C HamanoMerge branch 'jl/use-vsatisfy-correctly-for-2.0'
2014-04-22  Felipe Contrerasmergetools: add vimdiff3 mode
2014-03-31  Junio C HamanoMerge branch 'wt/doc-submodule-name-path-confusion-1'
2014-03-18  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree' into...
2014-03-18  Junio C HamanoMerge branch 'jk/config-path-include-fix' into maint
2014-03-14  Junio C HamanoMerge branch 'jc/check-attr-honor-working-tree'
2014-03-07  Junio C HamanoMerge branch 'jc/push-2.0-default-to-simple'
2014-02-27  Junio C HamanoMerge branch 'bs/stdio-undef-before-redef'
2014-02-27  Junio C HamanoMerge branch 'jk/config-path-include-fix'
2014-02-13  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2014-01-27  Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2014-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2014-01-21  Junio C HamanoMerge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui
2014-01-14  Junio C HamanoMerge branch 'jc/maint-pull-docfix-for-409b8d82' into...
2013-12-17  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix' into...
2013-12-09  Junio C HamanoMerge git://repo.or.cz/git-gui
2013-12-09  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-12-05  Junio C HamanoMerge branch 'jk/two-way-merge-corner-case-fix'
2013-11-07  Junio C HamanoMerge branch 'vd/doc-unpack-objects' into maint
2013-11-07  Junio C HamanoMerge branch 'jc/revision-range-unpeel' into maint
2013-11-04  Junio C HamanoMerge branch 'vd/doc-unpack-objects'
2013-11-04  Junio C HamanoMerge branch 'ak/cvsserver-stabilize-use-of-hash-keys'
2013-10-30  Junio C HamanoMerge branch 'jk/refs-c-squelch-gcc'
2013-10-30  Junio C HamanoMerge branch 'jk/date-c-double-semicolon'
2013-10-30  Junio C HamanoMerge branch 'sg/t3600-nul-sha1-fix'
2013-10-28  Junio C HamanoMerge branch 'ew/keepalive'
2013-10-28  Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2013-10-28  Junio C HamanoMerge branch 'jk/diff-algo' into maint
2013-10-23  Junio C HamanoMerge branch 'jc/pack-objects'
next