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