Merge branch 'tr/maint-bundle-boundary' into maint-1.7.8
[git] / mergetools / defaults
2012-02-06  Junio C HamanoSync with 1.7.6.6
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-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-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-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-05  Junio C HamanoMerge branch 'maint-1.7.6' into maint-1.7.7
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...
2011-11-01  Junio C HamanoMerge branch 'js/bisect-no-checkout' into maint
2011-11-01  Junio C HamanoMerge branch 'sp/smart-http-failure' into maint
2011-11-01  Junio C HamanoMerge jn/maint-http-error-message
2011-11-01  Junio C HamanoMerge branch 'jk/name-hash-dirent'
2011-11-01  Junio C HamanoMerge branch 'ss/blame-textconv-fake-working-tree'
2011-11-01  Junio C HamanoMerge branch 'nd/pretty-commit-log-message'
2011-10-27  Junio C HamanoMerge branch 'rj/gitweb-clean-js'
2011-10-26  Junio C HamanoMerge branch 'tc/submodule-clone-name-detection'
2011-10-26  Junio C HamanoMerge branch 'jm/maint-gitweb-filter-forks-fix'
2011-10-26  Junio C HamanoMerge branch 'jk/argv-array' into maint
2011-10-26  Junio C HamanoMerge branch 'maint-1.7.6' into maint
2011-10-26  Junio C HamanoMerge branch 'maint-1.7.6' into maint
2011-10-24  Junio C HamanoMerge branch 'maint-1.7.3' into maint
2011-10-21  Junio C HamanoMerge branch 'ss/inet-ntop'
2011-10-21  Junio C HamanoMerge branch 'jc/maint-remove-renamed-ref'
2011-10-21  Junio C HamanoMerge branch 'cn/doc-config-bare-subsection'
2011-10-21  Junio C HamanoMerge branch 'jc/unseekable-bundle'
2011-10-21  Junio C HamanoMerge branch 'nd/maint-autofix-tag-in-head' into maint
2011-10-21  Junio C HamanoMerge branch 'jc/apply-blank-at-eof-fix' into maint
2011-10-21  Junio C HamanoMerge branch 'rs/diff-cleanup-records-fix' into maint
2011-10-21  Junio C HamanoMerge branch 'il/archive-err-signal' into maint
2011-10-21  Junio C HamanoMerge branch 'js/maint-merge-one-file-osx-expr' into...
2011-10-21  Junio C HamanoMerge branch 'jm/maint-apply-detects-corrupt-patch...
2011-10-21  Junio C HamanoMerge branch 'jc/checkout-from-tree-keep-local-changes...
2011-10-21  Junio C HamanoMerge branch 'mm/maint-config-explicit-bool-display...
2011-10-19  Junio C HamanoMerge branch 'jm/maint-apply-detects-corrupt-patch...
2011-10-19  Junio C HamanoMerge branch 'js/log-show-children'
2011-10-19  Junio C HamanoMerge branch 'cb/httpd-test-fix-port'
2011-10-19  Junio C HamanoMerge branch 'md/smtp-tls-hello-again'
2011-10-18  Junio C HamanoMerge branch 'jk/http-auth'
2011-10-18  Junio C HamanoMerge branch 'jk/pull-rebase-with-work-tree'
2011-10-18  Junio C HamanoMerge branch 'sg/completion'
2011-10-18  Junio C HamanoMerge branch 'mm/maint-config-explicit-bool-display'
2011-10-18  Junio C HamanoMerge branch 'tc/fetch-leak'
2011-10-18  Junio C HamanoMerge branch 'jk/name-hash-dirent'
2011-10-18  Junio C HamanoMerge branch 'tm/completion-push-set-upstream'
2011-10-18  Junio C HamanoMerge branch 'tm/completion-commit-fixup-squash'
2011-10-18  Junio C HamanoMerge branch 'jc/checkout-from-tree-keep-local-changes'
2011-10-18  Junio C HamanoMerge branch 'js/bisect-no-checkout'
2011-10-16  Junio C HamanoMerge git://repo.or.cz/git-gui
2011-10-16  Junio C HamanoMerge branch 'ms/patch-id-with-overlong-line' into...
2011-10-16  Junio C HamanoMerge branch 'jc/maint-bundle-too-quiet' into maint
2011-10-16  Junio C HamanoMerge branch 'jk/filter-branch-require-clean-work-tree...
2011-10-16  Junio C HamanoMerge branch 'jc/maint-fsck-fwrite-size-check' into...
2011-10-16  Junio C HamanoMerge branch 'bk/ancestry-path' into maint
2011-10-16  Junio C HamanoMerge branch 'jk/maint-fetch-submodule-check-fix' into...
2011-10-16  Junio C HamanoMerge branch 'nm/grep-object-sha1-lock' into maint
2011-10-16  Junio C HamanoMerge branch 'jc/diff-index-unpack' into maint
2011-10-16  Junio C HamanoMerge branch 'mm/rebase-i-exec-edit' into maint
2011-10-16  Junio C HamanoMerge branch 'jc/maint-grep-untracked-exclude' into...
2011-10-14  Junio C HamanoMerge branch 'js/maint-merge-one-file-osx-expr'
2011-10-14  Junio C HamanoMerge branch 'jn/ident-from-etc-mailname'
2011-10-14  Junio C HamanoMerge branch 'il/archive-err-signal'
2011-10-14  Junio C HamanoMerge branch 'rs/diff-cleanup-records-fix'
2011-10-14  Junio C HamanoMerge branch 'rs/pending'
2011-10-14  Junio C HamanoMerge branch 'jc/is-url-simplify'
2011-10-14  Junio C HamanoMerge branch 'nd/git-daemon-error-msgs'
2011-10-14  Junio C HamanoMerge branch 'nd/daemon-log-sock-errors'
2011-10-14  Junio C HamanoMerge branch 'cp/git-web-browse-browsers'
2011-10-14  Junio C HamanoMerge branch 'jc/apply-blank-at-eof-fix'
2011-10-14  Junio C HamanoMerge branch 'nd/maint-autofix-tag-in-head'
next