git.oblomov.eu Git - git/history - builtin/merge-tree.c

2013-04-03	Junio C Hamano	Merge branch 'ap/maint-update-index-h-is-for-help'...	blob \| commitdiff \| raw
2013-04-03	Junio C Hamano	Merge branch 'jc/perl-cat-blob' into maint-1.8.1	blob \| commitdiff \| raw
2013-04-03	Junio C Hamano	Merge branch 'ob/imap-send-ssl-verify' into maint-1.8.1	blob \| commitdiff \| raw
2013-04-03	Junio C Hamano	Merge branch 'nd/index-pack-l10n-buf-overflow' into...	blob \| commitdiff \| raw
2013-03-27	John Keeping	merge-tree: fix typo in merge-tree.c::unresolved	blob \| commitdiff \| raw
2013-03-25	Junio C Hamano	Merge branch 'lf/bundle-verify-list-prereqs' into maint...	blob \| commitdiff \| raw \| diff to current
2013-03-25	Junio C Hamano	Merge branch 'tk/doc-filter-branch' into maint-1.8.1	blob \| commitdiff \| raw \| diff to current
2013-03-25	Junio C Hamano	Merge branch 'dm/ni-maxhost-may-be-missing' into maint...	blob \| commitdiff \| raw \| diff to current
2013-03-25	Junio C Hamano	Merge branch 'jc/color-diff-doc' into maint-1.8.1	blob \| commitdiff \| raw \| diff to current
2013-03-07	Junio C Hamano	Merge branch 'mh/maint-ceil-absolute' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-27	Junio C Hamano	Merge branch 'wk/man-deny-current-branch-is-default...	blob \| commitdiff \| raw \| diff to current
2013-02-27	Junio C Hamano	Merge branch 'jn/less-reconfigure' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'jc/mention-tracking-for-pull-default...	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'da/p4merge-mktemp-fix' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'al/mergetool-printf-fix' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'jx/utf8-printf-width' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'mg/bisect-doc' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'sp/smart-http-content-type-check' into...	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'jc/combine-diff-many-parents' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'jk/apply-similaritly-parsing' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'jk/remote-helpers-doc' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'ab/gitweb-use-same-scheme' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'zk/clean-report-failure' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'nd/clone-no-separate-git-dir-with-bare...	blob \| commitdiff \| raw \| diff to current
2013-02-25	Junio C Hamano	Merge branch 'da/p4merge-mktemp' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-20	Junio C Hamano	Merge branch 'ob/imap-send-ssl-verify' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'mz/pick-unborn' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'nd/fix-perf-parameters-in-tests' into...	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'jc/do-not-let-random-file-interfere-with...	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'ft/transport-report-segv' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'sb/gpg-plug-fd-leak' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'jc/fake-ancestor-with-non-blobs' into...	blob \| commitdiff \| raw \| diff to current
2013-02-07	Junio C Hamano	Merge branch 'jn/auto-depend-workaround-buggy-ccache...	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'bc/git-p4-for-python-2.4' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'nd/edit-branch-desc-while-detached' into...	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'jn/do-not-drop-username-when-reading...	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'jk/cvsimport-does-not-work-with-cvsps3...	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'dl/am-hg-locale' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'jc/help' into maint	blob \| commitdiff \| raw \| diff to current
2013-02-04	Junio C Hamano	Merge branch 'jc/merge-blobs' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jk/shortlog-no-wrap-doc' into maint	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| commitdiff \| raw \| diff to current
2013-01-10	Junio C Hamano	Merge branch 'ta/remove-stale-translated-tut' into...	blob \| commitdiff \| raw \| diff to current
2012-12-26	Junio C Hamano	merge-tree: fix d/f conflicts	blob \| commitdiff \| raw \| diff to current
2012-12-26	Junio C Hamano	merge-tree: add comments to clarify what these function...	blob \| commitdiff \| raw \| diff to current
2012-12-26	Junio C Hamano	merge-tree: lose unused "resolve_directories"	blob \| commitdiff \| raw \| diff to current
2012-12-26	Junio C Hamano	merge-tree: lose unused "flags" from merge_list	blob \| commitdiff \| raw \| diff to current
2012-12-10	Junio C Hamano	Which merge_file() function do you mean?	blob \| commitdiff \| raw \| diff to current
2012-10-17	Junio C Hamano	Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2012-10-08	Junio C Hamano	Merge branch 'os/commit-submodule-ignore' into maint	blob \| commitdiff \| raw \| diff to current
2012-10-01	Junio C Hamano	Merge branch 'os/commit-submodule-ignore'	blob \| commitdiff \| raw \| diff to current
2012-09-15	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents' into maint...	blob \| commitdiff \| raw \| diff to current
2012-09-12	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2012-09-12	Junio C Hamano	Merge branch 'da/gitk-reload-tag-contents'	blob \| commitdiff \| raw \| diff to current
2012-08-24	Junio C Hamano	Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'jn/block-sha1' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'ms/daemon-doc-typo' into maint	blob \| commitdiff \| raw \| diff to current
2012-08-06	Junio C Hamano	Merge branch 'lm/git-blame-el' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-24	Junio C Hamano	Merge branch 'jn/block-sha1'	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'...	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare' into maint	blob \| commitdiff \| raw \| diff to current
2012-07-22	Junio C Hamano	Merge branch 'ms/daemon-doc-typo'	blob \| commitdiff \| raw \| diff to current
2012-07-16	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare'	blob \| commitdiff \| raw \| diff to current
2012-07-16	Junio C Hamano	Merge branch 'jk/maint-commit-amend-only-no-paths'	blob \| commitdiff \| raw \| diff to current
2012-07-11	Junio C Hamano	Merge branch 'tg/maint-cache-name-compare' into tg...	blob \| commitdiff \| raw \| diff to current
2012-06-25	Junio C Hamano	Merge branch 'lp/no-cmd-http-fetch'	blob \| commitdiff \| raw \| diff to current
2012-06-25	Junio C Hamano	Merge branch 'lm/git-blame-el'	blob \| commitdiff \| raw \| diff to current
2012-06-17	Junio C Hamano	Merge branch 'js/maint-fast-export-mark-error' into...	blob \| commitdiff \| raw \| diff to current
2012-06-12	Junio C Hamano	Merge branch 'js/maint-fast-export-mark-error'	blob \| commitdiff \| raw \| diff to current
2012-06-03	Junio C Hamano	Merge branch 'ef/maint-rebase-error-message' into maint	blob \| commitdiff \| raw \| diff to current
2012-06-01	Junio C Hamano	Merge branch 'ef/maint-rebase-error-message'	blob \| commitdiff \| raw \| diff to current
2012-05-23	Junio C Hamano	Merge branch 'js/rev-parse-doc-fix'	blob \| commitdiff \| raw \| diff to current
2012-05-23	Junio C Hamano	Merge branch 'js/rebase-i-p-test-fix'	blob \| commitdiff \| raw \| diff to current
2012-04-26	Junio C Hamano	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| commitdiff \| raw \| diff to current
2012-04-16	Junio C Hamano	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| commitdiff \| raw \| diff to current
2012-04-10	David A. Greene	Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...	blob \| commitdiff \| raw \| diff to current
2012-04-02	Junio C Hamano	Merge branch 'pt/gitk'	blob \| commitdiff \| raw \| diff to current
2012-03-26	Junio C Hamano	Merge branch 'jn/maint-fast-import-empty-ls' into maint	blob \| commitdiff \| raw \| diff to current
2012-03-24	Junio C Hamano	Merge gitk changes from Paul Mackerras at git://ozlabs...	blob \| commitdiff \| raw \| diff to current
2012-03-16	Junio C Hamano	Merge "two fixes for fast-import's 'ls' command" from...	blob \| commitdiff \| raw \| diff to current
2012-03-16	Junio C Hamano	Merge branch 'th/doc-diff-submodule-option'	blob \| commitdiff \| raw \| diff to current
2012-03-12	Junio C Hamano	Merge branch 'jc/maint-diff-patch-header' into maint	blob \| commitdiff \| raw \| diff to current
2012-03-06	Junio C Hamano	Merge branch 'jc/maint-diff-patch-header'	blob \| commitdiff \| raw \| diff to current
2012-02-27	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix' into...	blob \| commitdiff \| raw \| diff to current
2012-02-23	Junio C Hamano	Merge branch 'pj/remote-set-branches-usage-fix'	blob \| commitdiff \| raw \| diff to current
2012-02-16	Junio C Hamano	Merge branch 'mm/empty-loose-error-message' into maint	blob \| commitdiff \| raw \| diff to current
2012-02-13	Junio C Hamano	Merge branch 'mm/empty-loose-error-message'	blob \| commitdiff \| raw \| diff to current
2012-01-29	Junio C Hamano	Merge branch 'rs/diff-postimage-in-context'	blob \| commitdiff \| raw \| diff to current
2012-01-27	Junio C Hamano	Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'jc/checkout-m-twoway' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'tr/doc-sh-setup' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'jk/maint-snprintf-va-copy' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-22	Junio C Hamano	Merge branch 'tr/doc-sh-setup'	blob \| commitdiff \| raw \| diff to current
2011-12-22	Junio C Hamano	Merge branch 'tr/pty-all'	blob \| commitdiff \| raw \| diff to current
2011-12-22	Junio C Hamano	Merge branch 'jk/maint-strbuf-missing-init'	blob \| commitdiff \| raw \| diff to current
2011-12-21	Junio C Hamano	Merge branch 'jl/submodule-status-failure-report' into...	blob \| commitdiff \| raw \| diff to current
2011-12-21	Junio C Hamano	Merge branch 'tr/userdiff-c-returns-pointer' into maint	blob \| commitdiff \| raw \| diff to current
2011-12-21	Junio C Hamano	Merge branch 'ms/commit-cc-option-helpstring' into...	blob \| commitdiff \| raw \| diff to current
2011-12-20	Junio C Hamano	Merge branch 'jc/checkout-m-twoway'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom