git.oblomov.eu Git - git/history - mergetools/defaults

2012-02-06	Junio C Hamano	Sync with 1.7.6.6	blob \| commitdiff \| raw
2012-01-13	Junio C Hamano	Merge branch 'maint-1.7.6' into maint-1.7.7	blob \| commitdiff \| raw
2012-01-12	Junio C Hamano	Merge branch 'maint-1.7.6' into maint-1.7.7	blob \| commitdiff \| raw
2012-01-10	Junio C Hamano	Merge the attributes fix in from maint-1.6.6 branch	blob \| commitdiff \| raw
2012-01-06	Junio C Hamano	Merge branch 'maint-1.7.6' into maint-1.7.7	blob \| commitdiff \| raw
2012-01-04	Junio C Hamano	Merge branch 'nd/maint-parse-depth' into maint	blob \| commitdiff \| raw
2012-01-03	Junio C Hamano	Merge branch 'maint-1.7.6' into maint-1.7.7	blob \| commitdiff \| raw
2011-12-28	Junio C Hamano	Merge branch 'jv/maint-config-set' into maint	blob \| commitdiff \| raw
2011-12-28	Junio C Hamano	Merge branch 'jc/checkout-m-twoway' into maint	blob \| commitdiff \| raw
2011-12-28	Junio C Hamano	Merge branch 'tr/doc-sh-setup' into maint	blob \| commitdiff \| raw
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init' into maint	blob \| commitdiff \| raw
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-push-v-is-verbose' into maint	blob \| commitdiff \| raw
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-snprintf-va-copy' into maint	blob \| commitdiff \| raw
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-mv' into maint	blob \| commitdiff \| raw
2011-12-28	Junio C Hamano	Merge branch 'ew/keepalive' into maint	blob \| commitdiff \| raw
2011-12-28	Junio C Hamano	Merge branch 'na/strtoimax' into maint	blob \| commitdiff \| raw
2011-12-21	Junio C Hamano	Merge branch 'jl/submodule-status-failure-report' into...	blob \| commitdiff \| raw
2011-12-21	Junio C Hamano	Merge branch 'tr/userdiff-c-returns-pointer' into maint	blob \| commitdiff \| raw
2011-12-21	Junio C Hamano	Merge branch 'ms/commit-cc-option-helpstring' into...	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'jc/maint-pack-object-cycle' into maint	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'mf/curl-select-fdset' into maint	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'maint-1.7.6' into maint-1.7.7	blob \| commitdiff \| raw
2011-12-05	Junio C Hamano	Merge branch 'maint-1.7.6' into maint-1.7.7	blob \| commitdiff \| raw
2011-11-23	Junio C Hamano	Merge branch 'maint' into tj/imap-send-remove-unused	blob \| commitdiff \| raw
2011-11-21	Junio C Hamano	Merge branch 'jk/maint-1.6.2-upload-archive' into jk...	blob \| commitdiff \| raw
2011-11-18	Junio C Hamano	Merge branch 'jc/maint-name-rev-all' into maint	blob \| commitdiff \| raw
2011-11-18	Junio C Hamano	Merge branch 'ml/mailmap' into maint	blob \| commitdiff \| raw
2011-11-18	Junio C Hamano	Merge branch 'jn/maint-notes-avoid-va-args' into maint	blob \| commitdiff \| raw
2011-11-12	Junio C Hamano	Merge branch 'ly/mktree-using-strbuf'	blob \| commitdiff \| raw
2011-11-09	Junio C Hamano	Merge branch 'jc/remote-setbranches-usage-fix'	blob \| commitdiff \| raw
2011-11-09	Junio C Hamano	Merge branch 'fc/remote-seturl-usage-fix'	blob \| commitdiff \| raw
2011-11-09	Junio C Hamano	Merge branch 'jc/maint-remove-renamed-ref' into maint	blob \| commitdiff \| raw
2011-11-09	Junio C Hamano	Merge branch 'jm/maint-gitweb-filter-forks-fix' into...	blob \| commitdiff \| raw
2011-11-08	Junio C Hamano	Merge branch 'ss/blame-textconv-fake-working-tree'	blob \| commitdiff \| raw
2011-11-07	Junio C Hamano	Merge branch 'ab/i18n-test-fix'	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'md/smtp-tls-hello-again' into maint	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'jk/pull-rebase-with-work-tree' into maint	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'jc/maint-diffstat-numstat-context' into...	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'js/bisect-no-checkout' into maint	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'sp/smart-http-failure' into maint	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge jn/maint-http-error-message	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'jk/name-hash-dirent'	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'ss/blame-textconv-fake-working-tree'	blob \| commitdiff \| raw
2011-11-01	Junio C Hamano	Merge branch 'nd/pretty-commit-log-message'	blob \| commitdiff \| raw
2011-10-27	Junio C Hamano	Merge branch 'rj/gitweb-clean-js'	blob \| commitdiff \| raw
2011-10-26	Junio C Hamano	Merge branch 'tc/submodule-clone-name-detection'	blob \| commitdiff \| raw
2011-10-26	Junio C Hamano	Merge branch 'jm/maint-gitweb-filter-forks-fix'	blob \| commitdiff \| raw
2011-10-26	Junio C Hamano	Merge branch 'jk/argv-array' into maint	blob \| commitdiff \| raw
2011-10-26	Junio C Hamano	Merge branch 'maint-1.7.6' into maint	blob \| commitdiff \| raw
2011-10-26	Junio C Hamano	Merge branch 'maint-1.7.6' into maint	blob \| commitdiff \| raw
2011-10-24	Junio C Hamano	Merge branch 'maint-1.7.3' into maint	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'ss/inet-ntop'	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'jc/maint-remove-renamed-ref'	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'cn/doc-config-bare-subsection'	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'jc/unseekable-bundle'	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'nd/maint-autofix-tag-in-head' into maint	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'jc/apply-blank-at-eof-fix' into maint	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'rs/diff-cleanup-records-fix' into maint	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'il/archive-err-signal' into maint	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'js/maint-merge-one-file-osx-expr' into...	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'jm/maint-apply-detects-corrupt-patch...	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'jc/checkout-from-tree-keep-local-changes...	blob \| commitdiff \| raw
2011-10-21	Junio C Hamano	Merge branch 'mm/maint-config-explicit-bool-display...	blob \| commitdiff \| raw
2011-10-19	Junio C Hamano	Merge branch 'jm/maint-apply-detects-corrupt-patch...	blob \| commitdiff \| raw
2011-10-19	Junio C Hamano	Merge branch 'js/log-show-children'	blob \| commitdiff \| raw
2011-10-19	Junio C Hamano	Merge branch 'cb/httpd-test-fix-port'	blob \| commitdiff \| raw
2011-10-19	Junio C Hamano	Merge branch 'md/smtp-tls-hello-again'	blob \| commitdiff \| raw
2011-10-18	Junio C Hamano	Merge branch 'jk/http-auth'	blob \| commitdiff \| raw
2011-10-18	Junio C Hamano	Merge branch 'jk/pull-rebase-with-work-tree'	blob \| commitdiff \| raw
2011-10-18	Junio C Hamano	Merge branch 'sg/completion'	blob \| commitdiff \| raw
2011-10-18	Junio C Hamano	Merge branch 'mm/maint-config-explicit-bool-display'	blob \| commitdiff \| raw
2011-10-18	Junio C Hamano	Merge branch 'tc/fetch-leak'	blob \| commitdiff \| raw
2011-10-18	Junio C Hamano	Merge branch 'jk/name-hash-dirent'	blob \| commitdiff \| raw
2011-10-18	Junio C Hamano	Merge branch 'tm/completion-push-set-upstream'	blob \| commitdiff \| raw
2011-10-18	Junio C Hamano	Merge branch 'tm/completion-commit-fixup-squash'	blob \| commitdiff \| raw
2011-10-18	Junio C Hamano	Merge branch 'jc/checkout-from-tree-keep-local-changes'	blob \| commitdiff \| raw
2011-10-18	Junio C Hamano	Merge branch 'js/bisect-no-checkout'	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'ms/patch-id-with-overlong-line' into...	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'jc/maint-bundle-too-quiet' into maint	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'jk/filter-branch-require-clean-work-tree...	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'jc/maint-fsck-fwrite-size-check' into...	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'bk/ancestry-path' into maint	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'jk/maint-fetch-submodule-check-fix' into...	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'nm/grep-object-sha1-lock' into maint	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'jc/diff-index-unpack' into maint	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'mm/rebase-i-exec-edit' into maint	blob \| commitdiff \| raw
2011-10-16	Junio C Hamano	Merge branch 'jc/maint-grep-untracked-exclude' into...	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'js/maint-merge-one-file-osx-expr'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'jn/ident-from-etc-mailname'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'il/archive-err-signal'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'rs/diff-cleanup-records-fix'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'rs/pending'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'jc/is-url-simplify'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'nd/git-daemon-error-msgs'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'nd/daemon-log-sock-errors'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'cp/git-web-browse-browsers'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'jc/apply-blank-at-eof-fix'	blob \| commitdiff \| raw
2011-10-14	Junio C Hamano	Merge branch 'nd/maint-autofix-tag-in-head'	blob \| commitdiff \| raw
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom