Merge branch 'jh/notes-merge-in-git-dir-worktree' into maint
[git] / mergetools / vim
2012-04-09  Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable...
2012-04-02  Junio C HamanoMerge branch 'pt/gitk'
2012-03-26  Junio C HamanoMerge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-24  Junio C HamanoMerge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16  Junio C HamanoMerge "two fixes for fast-import's 'ls' command" from...
2012-03-16  Junio C HamanoMerge branch 'th/doc-diff-submodule-option'
2012-03-12  Junio C HamanoMerge branch 'jc/maint-diff-patch-header' into maint
2012-03-12  Junio C HamanoMerge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-08  Junio C HamanoMerge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-06  Junio C HamanoMerge branch 'jc/maint-diff-patch-header'
2012-03-05  Junio C HamanoMerge branch 'jn/maint-gitweb-invalid-regexp' into...
2012-03-05  Junio C HamanoMerge branch 'sp/smart-http-failure-to-push' into maint
2012-03-01  Junio C HamanoMerge branch 'jn/maint-gitweb-invalid-regexp'
2012-02-27  Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27  Junio C HamanoMerge branch 'sp/smart-http-failure-to-push'
2012-02-23  Junio C HamanoMerge branch 'pj/remote-set-branches-usage-fix'
2012-02-21  Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-20  Junio C HamanoMerge branch 'cb/maint-t5541-make-server-port-portable'
2012-02-16  Junio C HamanoMerge branch 'jc/checkout-out-of-unborn' into maint
2012-02-16  Junio C HamanoMerge branch 'jc/maint-mailmap-output' into maint
2012-02-16  Junio C HamanoMerge branch 'jc/maint-commit-ignore-i-t-a' into maint
2012-02-16  Junio C HamanoMerge branch 'mm/empty-loose-error-message' into maint
2012-02-14  Junio C HamanoMerge branch 'jk/maint-tag-show-fixes' into maint
2012-02-13  Junio C HamanoMerge branch 'js/add-e-submodule-fix' into maint
2012-02-13  Junio C HamanoMerge branch 'jc/checkout-out-of-unborn'
2012-02-13  Junio C HamanoMerge branch 'jc/maint-mailmap-output'
2012-02-13  Junio C HamanoMerge branch 'jc/maint-commit-ignore-i-t-a'
2012-02-13  Junio C HamanoMerge branch 'jk/maint-tag-show-fixes'
2012-02-13  Junio C HamanoMerge branch 'mm/empty-loose-error-message'
2012-02-10  Junio C HamanoMerge branch 'js/add-e-submodule-fix'
2012-02-06  Junio C HamanoMerge branch 'sp/smart-http-failure-to-push' into maint
2012-02-06  Junio C HamanoMerge branch 'jc/maint-log-first-parent-pathspec' into...
2012-02-06  Junio C HamanoSync with 1.7.6.6
2012-01-29  Junio C HamanoMerge branch 'rs/diff-postimage-in-context'
2012-01-29  Junio C HamanoMerge branch 'sp/smart-http-failure-to-push'
2012-01-29  Junio C HamanoMerge branch 'jc/maint-log-first-parent-pathspec'
2012-01-29  Junio C HamanoMerge branch 'tr/maint-mailinfo'
2012-01-27  Junio C HamanoMerge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-18  Junio C HamanoMerge branch 'mh/maint-show-ref-doc'
2012-01-18  Junio C HamanoMerge branch 'tr/maint-word-diff-incomplete-line'
2012-01-13  Junio C HamanoMerge branch 'tr/maint-mailinfo'
2012-01-13  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
2012-01-12  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
2012-01-10  Junio C HamanoMerge the attributes fix in from maint-1.6.6 branch
2012-01-09  Junio C HamanoMerge branch 'mm/maint-gitweb-project-maxdepth'
2012-01-06  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
2012-01-04  Junio C HamanoMerge branch 'nd/maint-parse-depth' into maint
2012-01-03  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
2011-12-28  Junio C HamanoMerge branch 'jv/maint-config-set' into maint
2011-12-28  Junio C HamanoMerge branch 'jc/checkout-m-twoway' into maint
2011-12-28  Junio C HamanoMerge branch 'tr/doc-sh-setup' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-push-v-is-verbose' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-snprintf-va-copy' into maint
2011-12-28  Junio C HamanoMerge branch 'jk/maint-mv' into maint
2011-12-28  Junio C HamanoMerge branch 'ew/keepalive' into maint
2011-12-28  Junio C HamanoMerge branch 'na/strtoimax' into maint
2011-12-22  Junio C HamanoMerge branch 'tr/doc-sh-setup'
2011-12-22  Junio C HamanoMerge branch 'tr/pty-all'
2011-12-22  Junio C HamanoMerge branch 'jk/maint-strbuf-missing-init'
2011-12-22  Junio C HamanoMerge branch 'jk/maint-push-v-is-verbose'
2011-12-22  Junio C HamanoMerge branch 'jn/test-cleanup-7006'
2011-12-21  Junio C HamanoMerge branch 'jl/submodule-status-failure-report' into...
2011-12-21  Junio C HamanoMerge branch 'tr/userdiff-c-returns-pointer' into maint
2011-12-21  Junio C HamanoMerge branch 'ms/commit-cc-option-helpstring' into...
2011-12-20  Junio C HamanoMerge branch 'jc/checkout-m-twoway'
2011-12-20  Junio C HamanoMerge branch 'ew/keepalive'
2011-12-20  Junio C HamanoMerge branch 'jc/checkout-m-twoway'
2011-12-20  Junio C HamanoMerge branch 'jk/maint-snprintf-va-copy'
2011-12-20  Junio C HamanoMerge branch 'jk/maint-mv'
2011-12-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2011-12-14  Junio C HamanoMerge branch 'jl/submodule-status-failure-report'
2011-12-14  Junio C HamanoMerge branch 'tr/userdiff-c-returns-pointer'
2011-12-14  Junio C HamanoMerge branch 'jc/maint-pack-object-cycle' into maint
2011-12-14  Junio C HamanoMerge branch 'mf/curl-select-fdset' into maint
2011-12-14  Junio C HamanoMerge branch 'nd/maint-ignore-exclude' into maint-1.7.7
2011-12-14  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
2011-12-14  Junio C HamanoMerge branch 'master' of git://repo.or.cz/git-gui
2011-12-09  Junio C HamanoMerge branch 'ab/pull-rebase-config'
2011-12-05  Junio C HamanoMerge branch 'nd/maint-ignore-exclude'
2011-12-05  Junio C HamanoMerge branch 'jc/maint-pack-object-cycle'
2011-12-05  Junio C HamanoMerge branch 'na/strtoimax'
2011-12-05  Junio C HamanoMerge branch 'mf/curl-select-fdset'
2011-12-05  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
2011-11-28  Junio C HamanoMerge branch 'nd/maint-ignore-exclude' into nd/ignore...
2011-11-23  Junio C HamanoMerge branch 'maint' into tj/imap-send-remove-unused
2011-11-21  Junio C HamanoMerge branch 'jk/maint-1.6.2-upload-archive' into jk...
2011-11-18  Junio C HamanoMerge branch 'jc/maint-name-rev-all' into maint
2011-11-18  Junio C HamanoMerge branch 'ml/mailmap' into maint
2011-11-18  Junio C HamanoMerge branch 'jn/maint-notes-avoid-va-args' into maint
2011-11-12  Junio C HamanoMerge branch 'ly/mktree-using-strbuf'
2011-11-09  Junio C HamanoMerge branch 'jc/remote-setbranches-usage-fix'
2011-11-09  Junio C HamanoMerge branch 'fc/remote-seturl-usage-fix'
2011-11-09  Junio C HamanoMerge branch 'jc/maint-remove-renamed-ref' into maint
2011-11-09  Junio C HamanoMerge branch 'jm/maint-gitweb-filter-forks-fix' into...
2011-11-08  Junio C HamanoMerge branch 'ss/blame-textconv-fake-working-tree'
2011-11-07  Junio C HamanoMerge branch 'ab/i18n-test-fix'
2011-11-01  Junio C HamanoMerge branch 'md/smtp-tls-hello-again' into maint
2011-11-01  Junio C HamanoMerge branch 'jk/pull-rebase-with-work-tree' into maint
2011-11-01  Junio C HamanoMerge branch 'jc/maint-diffstat-numstat-context' into...
next