Merge branch 'cl/p4-use-diff-tree'
[gitweb.git] / mergetools / vimdiff2
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
2013-07-19 Merge branch 'ft/diff-rename-default-score-is-half...
2013-07-19 Merge branch 'jc/t1512-fix' into maint
2013-07-19 Merge branch 'mm/push-force-is-dangerous' into maint
2013-07-15 Merge branch 'tr/maint-apply-non-git-patch-parsefix...
2013-07-15 Merge branch 'bc/http-keep-memory-given-to-curl' into...
2013-07-12 Merge branch 'rs/pickaxe-simplify'
2013-07-12 Merge branch 'rr/name-rev-stdin-doc'
2013-07-12 Merge branch 'ft/diff-rename-default-score-is-half'
2013-07-11 Merge branch 'jc/t1512-fix'
2013-07-11 Merge branch 'jc/maint-diff-core-safecrlf'
2013-07-11 Merge branch 'mh/maint-lockfile-overflow'
2013-07-03 Merge branch 'cr/git-work-tree-sans-git-dir' into maint
2013-07-03 Merge branch 'fc/do-not-use-the-index-in-add-to-index...
2013-07-03 Merge branch 'cb/log-follow-with-combined' into maint
2013-07-03 Merge branch 'maint-1.8.1' into maint-1.8.2
2013-06-27 Merge branch 'mk/combine-diff-context-horizon-fix'...
2013-06-27 Merge branch 'bc/http-keep-memory-given-to-curl'
2013-06-26 Merge branch 'tr/maint-apply-non-git-patch-parsefix'
2013-06-26 Merge branch 'ph/builtin-srcs-are-in-subdir-these-days'
2013-06-26 Merge branch 'mm/merge-in-dirty-worktree-doc'
2013-06-26 Merge branch 'kb/diff-blob-blob-doc'
2013-06-26 Merge branch 'mm/push-force-is-dangerous'
2013-06-24 Merge branch 'nk/config-local-doc'
2013-06-24 Merge branch 'dk/version-gen-gitdir'
2013-06-24 Merge branch 'dk/maint-t5150-dirname'
2013-06-17 Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-06-11 Merge branch 'rr/maint-fetch-tag-doc-asterisks'
2013-06-11 Merge branch 'cr/git-work-tree-sans-git-dir'
2013-06-11 Merge branch 'cb/log-follow-with-combined'
2013-06-11 Merge branch 'fc/do-not-use-the-index-in-add-to-index'
2013-06-02 Merge branch 'mk/combine-diff-context-horizon-fix'
2013-05-29 Merge branch 'jk/lookup-object-prefer-latest'
2013-05-29 Merge branch 'mh/packed-refs-various'
2013-05-29 Merge branch 'as/check-ignore'
2013-05-29 Merge branch 'jc/prune-all'
2013-05-17 Merge git://ozlabs.org/~paulus/gitk
2013-05-13 Merge git://ozlabs.org/~paulus/gitk
2013-05-09 Merge branch 'tr/copy-revisions-from-stdin' into maint
2013-05-07 Merge branch 'jk/merge-tree-added-identically'
2013-05-01 Merge branch 'hb/git-pm-tempfile'
2013-04-28 Merge branch 'jk/merge-tree-added-identically'
2013-04-26 Merge branch 'ph/rebase-original'
2013-04-26 Merge branch 'jk/a-thread-only-dies-once' into maint
2013-04-26 Merge branch 'jk/receive-pack-deadlocks-with-early...
2013-04-26 Merge branch 'rs/empty-archive' into maint
2013-04-26 Merge branch 'pe/pull-rebase-v-q' into maint
2013-04-24 Merge branch 'jk/diff-algo-finishing-touches' into...
2013-04-24 Merge branch 'sr/log-SG-no-textconv' into maint
2013-04-24 Merge branch 'jc/merge-tag-object' into maint
2013-04-23 Merge branch 'jk/receive-pack-deadlocks-with-early...
2013-04-22 Merge branch 'jk/daemon-user-doc' into maint
2013-04-22 Merge branch 'jc/detached-head-doc' into maint
2013-04-22 Merge branch 'jk/show-branch-strbuf' into maint
2013-04-22 Merge branch 'js/rerere-forget-protect-against-NUL...
2013-04-22 Merge branch 'jc/apply-ws-fix-tab-in-indent' into maint
2013-04-22 Merge branch 'jk/suppress-clang-warning' into maint
2013-04-22 Merge branch 'lf/bundle-with-tip-wo-message' into maint
next