Merge branch 'jk/diffcore-break-divzero' into maint
[git] / mergetools / gvimdiff
2013-04-12  Junio C HamanoMerge branch 'jk/diffcore-break-divzero' into maint
2013-04-12  Junio C HamanoMerge branch 'cn/commit-amend-doc' into maint
2013-04-12  Junio C HamanoMerge branch 'jk/bisect-prn-unsigned' into maint
2013-04-12  Junio C HamanoMerge branch 'maint-1.8.1' into maint
2013-04-12  Junio C HamanoMerge branch 'tb/document-status-u-tradeoff' into maint
2013-04-07  Junio C HamanoSync with 1.8.1.6
2013-04-04  Junio C HamanoMerge branch 'nd/index-pack-threaded-fixes' into maint
2013-04-04  Junio C HamanoMerge branch 'jk/index-pack-correct-depth-fix' into...
2013-04-04  Junio C HamanoMerge branch 'jk/peel-ref' into maint
2013-04-03  Junio C HamanoMerge branch 'mg/gpg-interface-using-status' into maint
2013-04-03  Junio C HamanoMerge branch 'jc/describe' into maint
2013-04-03  Junio C HamanoMerge branch 'jk/alias-in-bare' into maint
2013-04-03  Junio C HamanoMerge branch 'ks/rfc2047-one-char-at-a-time' into maint
2013-04-03  Junio C HamanoMerge branch 'jk/empty-archive' into maint
2013-04-03  Junio C HamanoMerge branch 'ph/tag-force-no-warn-on-creation' into...
2013-04-03  Junio C HamanoMerge branch 'lf/setup-prefix-pathspec' into maint
2013-04-03  Junio C HamanoSync with 1.8.1 maintenance track
2013-04-01  Junio C HamanoMerge branch 'ap/maint-diff-rename-avoid-overlap' into...
2013-04-01  Junio C HamanoMerge branch 'rr/tests-dedup-test-config' into maint
2013-04-01  Junio C HamanoMerge branch 'yd/doc-merge-annotated-tag' into maint
2013-04-01  Junio C HamanoMerge branch 'tb/document-status-u-tradeoff' into maint
2013-03-28  Junio C HamanoMerge branch 'maint-1.8.1' into maint
2013-03-27  Junio C HamanoMerge branch 'maint-1.8.1' into maint
2013-03-26  Junio C HamanoMerge branch 'maint-1.8.1' into maint
2013-03-26  Junio C HamanoMerge branch 'we/submodule-update-prefix-output' into...
2013-03-26  Junio C HamanoMerge branch 'rs/zip-compresssed-size-with-export-subst...
2013-03-26  Junio C HamanoMerge branch 'jk/utf-8-can-be-spelled-differently'...
2013-03-26  Junio C HamanoMerge branch 'nd/branch-error-cases' into maint
2013-03-26  Junio C HamanoMerge branch 'ap/maint-update-index-h-is-for-help'...
2013-03-26  Junio C HamanoMerge branch 'jc/perl-cat-blob' into maint
2013-03-26  Junio C HamanoMerge branch 'ob/imap-send-ssl-verify' into maint
2013-03-26  Junio C HamanoMerge branch 'nd/index-pack-l10n-buf-overflow' into...
2013-03-26  Junio C HamanoMerge branch 'jc/maint-push-refspec-default-doc' into...
2013-03-26  Junio C HamanoMerge branch 'gp/avoid-explicit-mention-of-dot-git...
2013-03-26  Junio C HamanoMerge branch 'jc/maint-reflog-expire-clean-mark-typofix...
2013-03-25  Junio C HamanoMerge branch 'maint-1.8.1' into maint
2013-03-17  Junio C HamanoMerge branch 'maint'
2013-03-17  Junio C HamanoMerge branch 'maint'
2013-03-11  Junio C HamanoMerge branch 'maint'
2013-03-11  Junio C HamanoMerge branch 'mp/complete-paths'
2013-03-11  Junio C HamanoMerge branch 'maint'
2013-03-09  Junio C HamanoMerge branch 'maint'
2013-03-07  Junio C HamanoMerge branch 'mp/complete-paths'
2013-03-07  Junio C HamanoMerge branch 'maint'
2013-03-01  Junio C HamanoSync with 1.8.1.5
2013-02-27  Junio C HamanoMerge branch 'maint'
2013-02-27  Junio C HamanoMerge branch 'mh/maint-ceil-absolute'
2013-02-25  Junio C HamanoSync with 'maint'
2013-02-25  Junio C HamanoMerge branch 'wk/user-manual'
2013-02-25  Junio C HamanoMerge branch 'jn/less-reconfigure'
2013-02-25  Junio C HamanoMerge branch 'as/check-ignore'
2013-02-25  Junio C HamanoMerge branch 'ct/autoconf-htmldir'
2013-02-25  Junio C HamanoMerge branch 'wk/man-deny-current-branch-is-default...
2013-02-20  Junio C HamanoSync with v1.8.1.4
2013-02-19  Junio C HamanoMerge branch 'jc/mention-tracking-for-pull-default'
2013-02-19  Junio C HamanoMerge branch 'mm/config-intro-in-git-doc'
2013-02-18  Junio C HamanoMerge branch 'maint'
2013-02-17  Junio C HamanoMerge branch 'jc/hidden-refs'
2013-02-17  Junio C HamanoMerge branch 'mp/diff-algo-config'
2013-02-17  Junio C HamanoMerge branch 'jk/rebase-i-comment-char'
2013-02-17  Junio C HamanoMerge branch 'jk/read-commit-buffer-data-after-free'
2013-02-15  Junio C HamanoMerge branch 'wk/man-deny-current-branch-is-default...
2013-02-15  Junio C HamanoMerge branch 'ef/non-ascii-parse-options-error-diag'
2013-02-15  Junio C HamanoMerge branch 'da/p4merge-mktemp-fix'
2013-02-14  Junio C HamanoMerge branch 'jk/diff-graph-cleanup'
2013-02-14  Junio C HamanoMerge branch 'nd/status-show-in-progress'
2013-02-14  Junio C HamanoMerge branch 'bw/get-tz-offset-perl'
2013-02-14  Junio C HamanoMerge branch 'al/mergetool-printf-fix'
2013-02-14  Junio C HamanoMerge branch 'jk/error-const-return'
2013-02-14  Junio C HamanoMerge branch 'jx/utf8-printf-width'
2013-02-14  Junio C HamanoMerge branch 'mg/bisect-doc'
2013-02-14  Junio C HamanoMerge branch 'tz/perl-styles'
2013-02-14  Junio C HamanoMerge branch 'jc/extended-fake-ancestor-for-gitlink'
2013-02-14  Junio C HamanoMerge branch 'dg/subtree-fixes'
2013-02-12  Junio C HamanoMerge branch 'maint'
2013-02-11  Junio C HamanoMerge branch 'maint'
2013-02-11  Junio C HamanoMerge branch 'sp/smart-http-content-type-check'
2013-02-09  Junio C HamanoMerge branch 'master' of git://github.com/git-l10n...
2013-02-08  Junio C HamanoMerge branch 'jc/combine-diff-many-parents'
2013-02-08  Junio C HamanoMerge branch 'jk/apply-similaritly-parsing'
2013-02-08  Junio C HamanoMerge branch 'mk/tcsh-complete-only-known-paths'
2013-02-08  Junio C HamanoMerge branch 'mp/complete-paths'
2013-02-08  Junio C HamanoMerge branch 'ct/autoconf-htmldir'
2013-02-07  Junio C HamanoSync with 1.8.1.3
2013-02-07  Junio C HamanoMerge branch 'ss/mergetools-tortoise'
2013-02-07  Junio C HamanoMerge branch 'jk/mergetool'
2013-01-29  David Aguilarmergetools: simplify how we handle "vim" and "defaults"