git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - git-mergetool--lib.sh

projects / thirdparty / git.git / history

[thirdparty/git.git] / git-mergetool--lib.sh

2012-02-23	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix'	blob \| commitdiff \| raw
2012-02-21	Junio C Hamano	Merge branch 'cb/maint-t5541-make-server-port-portable...	blob \| commitdiff \| raw
2012-02-20	Junio C Hamano	Merge branch 'cb/maint-t5541-make-server-port-portable'	blob \| commitdiff \| raw
2012-02-16	Junio C Hamano	Merge branch 'jc/checkout-out-of-unborn' into maint	blob \| commitdiff \| raw
2012-02-16	Junio C Hamano	Merge branch 'jc/maint-mailmap-output' into maint	blob \| commitdiff \| raw
2012-02-16	Junio C Hamano	Merge branch 'jc/maint-commit-ignore-i-t-a' into maint	blob \| commitdiff \| raw
2012-02-16	Junio C Hamano	Merge branch 'mm/empty-loose-error-message' into maint	blob \| commitdiff \| raw
2012-02-14	Junio C Hamano	Merge branch 'jk/maint-tag-show-fixes' into maint	blob \| commitdiff \| raw
2012-02-13	Junio C Hamano	Merge branch 'js/add-e-submodule-fix' into maint	blob \| commitdiff \| raw
2012-02-13	Junio C Hamano	Merge branch 'jc/checkout-out-of-unborn'	blob \| commitdiff \| raw
2012-02-13	Junio C Hamano	Merge branch 'jc/maint-mailmap-output'	blob \| commitdiff \| raw
2012-02-13	Junio C Hamano	Merge branch 'jc/maint-commit-ignore-i-t-a'	blob \| commitdiff \| raw
2012-02-13	Junio C Hamano	Merge branch 'jk/maint-tag-show-fixes'	blob \| commitdiff \| raw
2012-02-13	Junio C Hamano	Merge branch 'mm/empty-loose-error-message'	blob \| commitdiff \| raw
2012-02-10	Junio C Hamano	Merge branch 'js/add-e-submodule-fix'	blob \| commitdiff \| raw
2012-02-06	Junio C Hamano	Merge branch 'sp/smart-http-failure-to-push' into maint	blob \| commitdiff \| raw
2012-02-06	Junio C Hamano	Merge branch 'jc/maint-log-first-parent-pathspec' into...	blob \| commitdiff \| raw
2012-02-06	Junio C Hamano	Sync with 1.7.6.6	blob \| commitdiff \| raw
2012-01-29	Junio C Hamano	Merge branch 'rs/diff-postimage-in-context'	blob \| commitdiff \| raw
2012-01-29	Junio C Hamano	Merge branch 'sp/smart-http-failure-to-push'	blob \| commitdiff \| raw
2012-01-29	Junio C Hamano	Merge branch 'jc/maint-log-first-parent-pathspec'	blob \| commitdiff \| raw
2012-01-29	Junio C Hamano	Merge branch 'tr/maint-mailinfo'	blob \| commitdiff \| raw
2012-01-27	Junio C Hamano	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...	blob \| commitdiff \| raw
2012-01-18	Junio C Hamano	Merge branch 'mh/maint-show-ref-doc'	blob \| commitdiff \| raw
2012-01-18	Junio C Hamano	Merge branch 'tr/maint-word-diff-incomplete-line'	blob \| commitdiff \| raw
2012-01-13	Junio C Hamano	Merge branch 'tr/maint-mailinfo'	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-09	Junio C Hamano	Merge branch 'mm/maint-gitweb-project-maxdepth'	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-22	Junio C Hamano	Merge branch 'tr/doc-sh-setup'	blob \| commitdiff \| raw
2011-12-22	Junio C Hamano	Merge branch 'tr/pty-all'	blob \| commitdiff \| raw
2011-12-22	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init'	blob \| commitdiff \| raw
2011-12-22	Junio C Hamano	Merge branch 'jk/maint-push-v-is-verbose'	blob \| commitdiff \| raw
2011-12-22	Junio C Hamano	Merge branch 'jn/test-cleanup-7006'	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-20	Junio C Hamano	Merge branch 'jc/checkout-m-twoway'	blob \| commitdiff \| raw
2011-12-20	Junio C Hamano	Merge branch 'ew/keepalive'	blob \| commitdiff \| raw
2011-12-20	Junio C Hamano	Merge branch 'jc/checkout-m-twoway'	blob \| commitdiff \| raw
2011-12-20	Junio C Hamano	Merge branch 'jk/maint-snprintf-va-copy'	blob \| commitdiff \| raw
2011-12-20	Junio C Hamano	Merge branch 'jk/maint-mv'	blob \| commitdiff \| raw
2011-12-18	Junio C Hamano	Update jk/maint-strbuf-missing-init to builtin/ rename	blob \| commitdiff \| raw \| diff to current
2011-12-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'jl/submodule-status-failure-report'	blob \| commitdiff \| raw
2011-12-14	Junio C Hamano	Merge branch 'tr/userdiff-c-returns-pointer'	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-14	Junio C Hamano	Merge branch 'jk/maint-fetch-status-table' into maint...	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'jc/maint-name-rev-all' into maint-1.7.6	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'ml/mailmap' into maint-1.7.6	blob \| commitdiff \| raw \| diff to current
2011-12-14	Junio C Hamano	Merge branch 'master' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw
2011-12-09	Junio C Hamano	Merge branch 'ab/pull-rebase-config'	blob \| commitdiff \| raw
2011-12-05	Junio C Hamano	Merge branch 'nd/maint-ignore-exclude'	blob \| commitdiff \| raw
2011-12-05	Junio C Hamano	Merge branch 'jc/maint-pack-object-cycle'	blob \| commitdiff \| raw
2011-12-05	Junio C Hamano	Merge branch 'na/strtoimax'	blob \| commitdiff \| raw
2011-12-05	Junio C Hamano	Merge branch 'mf/curl-select-fdset'	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-28	Junio C Hamano	Merge branch 'nd/maint-ignore-exclude' into nd/ignore...	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-10	Junio C Hamano	Merge "Move 'builtin-*' into a 'builtin/' subdirectory"	blob \| commitdiff \| raw \| diff to current
2011-11-10	Junio C Hamano	Merge 'build-in git-mktree'	blob \| commitdiff \| raw \| diff to current
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 'bc/attr-ignore-case' 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
next

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

RSS Atom