Merge branch 'rs/zip-compresssed-size-with-export-subst'
[gitweb.git] / mergetools / vimdiff2
2013-03-21 Merge branch 'rs/zip-compresssed-size-with-export-subst'
2013-03-21 Merge branch 'mn/send-email-works-with-credential'
2013-03-21 Merge branch 'tz/credential-authinfo'
2013-03-21 Merge branch 'jk/utf-8-can-be-spelled-differently'
2013-03-21 Merge branch 'mg/gpg-interface-using-status'
2013-03-21 Merge branch 'rt/commit-cleanup-config'
2013-03-21 Merge branch 'nd/branch-error-cases'
2013-03-21 Merge branch 'ap/maint-update-index-h-is-for-help'
2013-03-21 Merge branch 'jc/perl-cat-blob'
2013-03-21 Merge branch 'ob/imap-send-ssl-verify'
2013-03-21 Merge branch 'jc/fetch-raw-sha1'
2013-03-21 Merge branch 'nd/preallocate-hash'
2013-03-21 Merge branch 'nd/index-pack-l10n-buf-overflow'
2013-03-21 Merge branch 'tb/document-status-u-tradeoff'
2013-03-21 Merge branch 'jn/shell-disable-interactive'
2013-03-21 Merge branch 'jc/maint-push-refspec-default-doc'
2013-03-19 Merge branch 'lf/bundle-verify-list-prereqs'
2013-03-19 Merge branch 'tk/doc-filter-branch'
2013-03-19 Merge branch 'dm/ni-maxhost-may-be-missing'
2013-03-19 Merge branch 'gp/describe-match-uses-glob-pattern'
2013-03-19 Merge branch 'gp/avoid-explicit-mention-of-dot-git...
2013-03-19 Merge branch 'nd/doc-index-format'
2013-03-19 Merge branch 'wk/doc-pre-rebase'
2013-03-19 Merge branch 'jc/color-diff-doc'
2013-03-17 Merge branch 'maint'
2013-03-17 Merge branch 'maint'
2013-03-11 Merge branch 'maint'
2013-03-11 Merge branch 'mp/complete-paths'
2013-03-11 Merge branch 'maint'
2013-03-09 Merge branch 'maint'
2013-03-07 Merge branch 'mp/complete-paths'
2013-03-07 Merge branch 'maint'
2013-03-01 Sync with 1.8.1.5
2013-02-27 Merge branch 'maint'
2013-02-27 Merge branch 'mh/maint-ceil-absolute'
2013-02-25 Sync with 'maint'
2013-02-25 Merge branch 'wk/user-manual'
2013-02-25 Merge branch 'jn/less-reconfigure'
2013-02-25 Merge branch 'as/check-ignore'
2013-02-25 Merge branch 'ct/autoconf-htmldir'
2013-02-25 Merge branch 'wk/man-deny-current-branch-is-default...
2013-02-20 Sync with v1.8.1.4
2013-02-19 Merge branch 'jc/mention-tracking-for-pull-default'
2013-02-19 Merge branch 'mm/config-intro-in-git-doc'
2013-02-18 Merge branch 'maint'
2013-02-17 Merge branch 'jc/hidden-refs'
2013-02-17 Merge branch 'mp/diff-algo-config'
2013-02-17 Merge branch 'jk/rebase-i-comment-char'
2013-02-17 Merge branch 'jk/read-commit-buffer-data-after-free'
2013-02-15 Merge branch 'wk/man-deny-current-branch-is-default...
2013-02-15 Merge branch 'ef/non-ascii-parse-options-error-diag'
2013-02-15 Merge branch 'da/p4merge-mktemp-fix'
2013-02-14 Merge branch 'jk/diff-graph-cleanup'
2013-02-14 Merge branch 'nd/status-show-in-progress'
2013-02-14 Merge branch 'bw/get-tz-offset-perl'
2013-02-14 Merge branch 'al/mergetool-printf-fix'
2013-02-14 Merge branch 'jk/error-const-return'
2013-02-14 Merge branch 'jx/utf8-printf-width'
2013-02-14 Merge branch 'mg/bisect-doc'
2013-02-14 Merge branch 'tz/perl-styles'
2013-02-14 Merge branch 'jc/extended-fake-ancestor-for-gitlink'
2013-02-14 Merge branch 'dg/subtree-fixes'
2013-02-12 Merge branch 'maint'
2013-02-11 Merge branch 'maint'
2013-02-11 Merge branch 'sp/smart-http-content-type-check'
2013-02-09 Merge branch 'master' of git://github.com/git-l10n...
2013-02-08 Merge branch 'jc/combine-diff-many-parents'
2013-02-08 Merge branch 'jk/apply-similaritly-parsing'
2013-02-08 Merge branch 'mk/tcsh-complete-only-known-paths'
2013-02-08 Merge branch 'mp/complete-paths'
2013-02-08 Merge branch 'ct/autoconf-htmldir'
2013-02-07 Sync with 1.8.1.3
2013-02-07 Merge branch 'ss/mergetools-tortoise'
2013-02-07 Merge branch 'jk/mergetool'
2013-01-29 mergetools: simplify how we handle "vim" and "defaults"