Andrew's git - gitweb.git/history

[gitweb.git] / mergetools / vimdiff

2014-06-09	Merge branch 'lt/request-pull'	blob \| diff \| raw
2014-06-06	Merge branch 'ss/howto-manage-trunk'	blob \| diff \| raw
2014-06-06	Merge branch 'mc/git-p4-prepare-p4-only'	blob \| diff \| raw
2014-06-06	Merge branch 'jn/test-lint-unmoor'	blob \| diff \| raw
2014-06-06	Merge branch 'ep/shell-assign-and-export-vars'	blob \| diff \| raw
2014-06-06	Merge branch 'jj/command-line-adjective'	blob \| diff \| raw
2014-06-06	Merge branch 'jc/coding-guidelines'	blob \| diff \| raw
2014-06-06	Merge branch 'nd/status-auto-comment-char'	blob \| diff \| raw
2014-06-06	Merge branch 'mt/rebase-i-keep-empty-test'	blob \| diff \| raw
2014-06-06	Merge branch 'mk/show-s-no-extra-blank-line-for-merges'	blob \| diff \| raw
2014-06-06	Merge branch 'sk/spawn-less-case-insensitively-from...	blob \| diff \| raw
2014-06-06	Merge branch 'jd/subtree'	blob \| diff \| raw
2014-06-06	Merge branch 'wk/doc-clarify-upstream'	blob \| diff \| raw
2014-06-06	Merge branch 'tb/unicode-6.3-zero-width'	blob \| diff \| raw
2014-06-06	Merge branch 'jk/index-pack-report-missing'	blob \| diff \| raw
2014-06-06	Merge branch 'bc/blame-crlf-test'	blob \| diff \| raw
2014-06-06	Merge branch 'sk/submodules-absolute-path-on-windows'	blob \| diff \| raw
2014-06-06	Merge branch 'dk/blame-reorg'	blob \| diff \| raw
2014-06-06	Merge branch 'wg/svn-fe-style-fixes'	blob \| diff \| raw
2014-06-06	Merge branch 'jn/contrib-remove-vim'	blob \| diff \| raw
2014-06-06	Merge branch 'jn/contrib-remove-diffall'	blob \| diff \| raw
2014-06-06	Merge branch 'dt/merge-recursive-case-insensitive'	blob \| diff \| raw
2014-06-06	Merge branch 'rs/reflog-exists'	blob \| diff \| raw
2014-06-06	Merge branch 'tg/tag-state-tag-name-in-editor-hints'	blob \| diff \| raw
2014-06-06	Merge branch 'jk/grep-tell-run-command-to-cd-when-runni...	blob \| diff \| raw
2014-06-06	Merge branch 'fc/status-printf-squelch-format-zero...	blob \| diff \| raw
2014-06-06	Merge branch 'jk/squelch-compiler-warning-from-funny...	blob \| diff \| raw
2014-06-06	Merge branch 'dk/raise-core-deltabasecachelimit'	blob \| diff \| raw
2014-06-06	Merge branch 'tl/relax-in-poll-emulation'	blob \| diff \| raw
2014-06-06	Merge branch 'jk/utf8-switch-between-nfd-and-nfc'	blob \| diff \| raw
2014-06-06	Merge branch 'da/imap-send-use-credential-helper'	blob \| diff \| raw
2014-06-06	Merge branch 'je/pager-do-not-recurse'	blob \| diff \| raw
2014-06-06	Merge branch 'jk/commit-C-pick-empty'	blob \| diff \| raw
2014-06-06	Merge branch 'mm/pager-less-sans-S'	blob \| diff \| raw
2014-06-03	Merge branch 'sk/msvc-dynlink-crt'	blob \| diff \| raw
2014-06-03	Merge branch 'ew/config-protect-mode'	blob \| diff \| raw
2014-06-03	Merge branch 'bg/strbuf-trim'	blob \| diff \| raw
2014-06-03	Merge branch 'jk/commit-date-approxidate'	blob \| diff \| raw
2014-06-03	Merge branch 'ep/shell-command-substitution'	blob \| diff \| raw
2014-06-03	Merge branch 'fc/rerere-conflict-style'	blob \| diff \| raw
2014-06-03	Merge branch 'dt/api-doc-setup-gently'	blob \| diff \| raw
2014-06-03	Merge branch 'fc/mergetool-prompt'	blob \| diff \| raw
2014-06-03	Merge branch 'mm/mediawiki-encoding-fix'	blob \| diff \| raw
2014-06-03	Merge branch 'sk/tag-contains-wo-recursion'	blob \| diff \| raw
2014-06-03	Merge branch 'ef/send-email-absolute-path-to-the-command'	blob \| diff \| raw
2014-06-03	Merge branch 'jx/blame-align-relative-time'	blob \| diff \| raw
2014-06-03	Merge branch 'lr/git-run-setup-gently'	blob \| diff \| raw
2014-06-03	Merge branch 'fc/mergetools-vimdiff3'	blob \| diff \| raw
2014-05-19	Merge branch 'jl/use-vsatisfy-correctly-for-2.0'	blob \| diff \| raw \| diff to current
2014-04-22	mergetools: add vimdiff3 mode	blob \| diff \| raw
2014-03-31	Merge branch 'wt/doc-submodule-name-path-confusion-1'	blob \| diff \| raw \| diff to current
2014-03-18	Merge branch 'jc/check-attr-honor-working-tree' into...	blob \| diff \| raw \| diff to current
2014-03-18	Merge branch 'jk/config-path-include-fix' into maint	blob \| diff \| raw \| diff to current
2014-03-14	Merge branch 'jc/check-attr-honor-working-tree'	blob \| diff \| raw \| diff to current
2014-03-07	Merge branch 'jc/push-2.0-default-to-simple'	blob \| diff \| raw \| diff to current
2014-02-27	Merge branch 'bs/stdio-undef-before-redef'	blob \| diff \| raw \| diff to current
2014-02-27	Merge branch 'jk/config-path-include-fix'	blob \| diff \| raw \| diff to current
2014-02-13	Merge branch 'jc/revision-range-unpeel' into maint	blob \| diff \| raw \| diff to current
2014-01-27	Merge branch 'jc/revision-range-unpeel'	blob \| diff \| raw \| diff to current
2014-01-23	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2014-01-21	Merge tag 'gitgui-0.19.0' of repo.or.cz/r/git-gui	blob \| diff \| raw \| diff to current
2014-01-14	Merge branch 'jc/maint-pull-docfix-for-409b8d82' into...	blob \| diff \| raw \| diff to current
2013-12-17	Merge branch 'jk/two-way-merge-corner-case-fix' into...	blob \| diff \| raw \| diff to current
2013-12-09	Merge git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2013-12-09	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-12-05	Merge branch 'jk/two-way-merge-corner-case-fix'	blob \| diff \| raw \| diff to current
2013-11-07	Merge branch 'vd/doc-unpack-objects' into maint	blob \| diff \| raw \| diff to current
2013-11-07	Merge branch 'jc/revision-range-unpeel' into maint	blob \| diff \| raw \| diff to current
2013-11-04	Merge branch 'vd/doc-unpack-objects'	blob \| diff \| raw \| diff to current
2013-11-04	Merge branch 'ak/cvsserver-stabilize-use-of-hash-keys'	blob \| diff \| raw \| diff to current
2013-10-30	Merge branch 'jk/refs-c-squelch-gcc'	blob \| diff \| raw \| diff to current
2013-10-30	Merge branch 'jk/date-c-double-semicolon'	blob \| diff \| raw \| diff to current
2013-10-30	Merge branch 'sg/t3600-nul-sha1-fix'	blob \| diff \| raw \| diff to current
2013-10-28	Merge branch 'ew/keepalive'	blob \| diff \| raw \| diff to current
2013-10-28	Merge branch 'jc/revision-range-unpeel'	blob \| diff \| raw \| diff to current
2013-10-28	Merge branch 'jk/diff-algo' into maint	blob \| diff \| raw \| diff to current
2013-10-23	Merge branch 'jc/pack-objects'	blob \| diff \| raw \| diff to current
2013-10-17	Merge branch 'jc/cvsserver-perm-bit-fix' into maint	blob \| diff \| raw \| diff to current
2013-10-14	Merge branch 'rj/highlight-test-hang'	blob \| diff \| raw \| diff to current
2013-10-14	Merge branch 'nv/doc-config-signingkey'	blob \| diff \| raw \| diff to current
2013-10-14	Merge branch 'jk/diff-algo'	blob \| diff \| raw \| diff to current
2013-10-08	Merge branch 'tz/credential-netrc'	blob \| diff \| raw \| diff to current
2013-09-26	Merge branch 'js/xread-in-full' into maint	blob \| diff \| raw \| diff to current
2013-09-18	Merge branch 'jc/cvsserver-perm-bit-fix'	blob \| diff \| raw \| diff to current
2013-09-12	Merge branch 'mn/doc-pack-heu-remove-dead-pastebin'	blob \| diff \| raw \| diff to current
2013-09-11	Merge branch 'js/xread-in-full'	blob \| diff \| raw \| diff to current
2013-09-04	Merge branch 'tr/fd-gotcha-fixes'	blob \| diff \| raw \| diff to current
2013-08-05	Merge branch 'dn/test-reject-utf-16'	blob \| diff \| raw \| diff to current
2013-07-31	Merge branch 'jk/commit-how-to-abort-cherry-pick'	blob \| diff \| raw \| diff to current
2013-07-31	Merge branch 'ds/doc-two-kinds-of-tags'	blob \| diff \| raw \| diff to current
2013-07-30	Merge branch 'jk/capabilities-doc'	blob \| diff \| raw \| diff to current
2013-07-22	Merge branch 'mk/upload-pack-off-by-one-dead-code-removal'	blob \| diff \| raw \| diff to current
2013-07-22	Merge branch 'jk/t0008-sigpipe-fix'	blob \| diff \| raw \| diff to current
2013-07-22	Merge branch 'tr/protect-low-3-fds'	blob \| diff \| raw \| diff to current
2013-07-22	Merge branch 'sb/parse-object-buffer-eaten'	blob \| diff \| raw \| diff to current
2013-07-22	Merge branch 'tr/fd-gotcha-fixes'	blob \| diff \| raw \| diff to current
2013-07-22	Merge branch 'rr/maint-fetch-tag-doc-asterisks' into...	blob \| diff \| raw \| diff to current
2013-07-22	Merge branch 'dk/maint-t5150-dirname' into maint	blob \| diff \| raw \| diff to current
2013-07-22	Merge branch 'dk/version-gen-gitdir' into maint	blob \| diff \| raw \| diff to current
2013-07-22	Merge branch 'nk/config-local-doc' into maint	blob \| diff \| raw \| diff to current
next