git.oblomov.eu Git - git/history - Documentation/git-merge-tree.txt

[git] / Documentation / git-merge-tree.txt

2013-09-19	Junio C Hamano	Merge branch 'jk/config-int-range-check'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'maint'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'jc/url-match'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'jc/cvsserver-perm-bit-fix'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'bc/send-email-ssl-die-message-fix'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'uh/git-svn-serf-fix'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'fc/contrib-bzr-hg-fixes'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'js/add-i-mingw'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'ks/p4-view-spec'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'jk/duplicate-objects-in-packs'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'nd/git-dir-pointing-at-gitfile'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'jk/pager-bypass-cat-for-default-pager'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'fc/t3200-fixes'	blob \| commitdiff \| raw
2013-09-18	Junio C Hamano	Merge branch 'fc/rev-parse-test-updates'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'jk/remove-remote-helpers-in-python'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'ss/doclinks'	blob \| commitdiff \| raw
2013-09-17	Junio C Hamano	Merge branch 'rh/ishes-doc'	blob \| commitdiff \| raw
2013-09-04	Richard Hansen	use 'tree-ish' instead of 'treeish'	blob \| commitdiff \| raw
2013-06-17	Junio C Hamano	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| commitdiff \| raw \| diff to current
2013-05-17	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-05-13	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-04-03	Junio C Hamano	Merge branch 'jk/checkout-attribute-lookup' into maint...	blob \| commitdiff \| raw \| diff to current
2013-03-28	Junio C Hamano	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| commitdiff \| raw \| diff to current
2013-03-28	Junio C Hamano	Merge branch 'jk/checkout-attribute-lookup'	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-01-30	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-01-28	Junio C Hamano	Merge branch 'dl/am-hg-locale'	blob \| commitdiff \| raw \| diff to current
2013-01-23	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2013-01-14	Junio C Hamano	Merge branch 'jk/maint-fast-import-doc-reorder' into...	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 'jk/maint-fast-import-doc-dedup-done'...	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-12	Junio C Hamano	Merge branch 'jk/maint-fast-import-doc-reorder'	blob \| commitdiff \| raw \| diff to current
2013-01-12	Junio C Hamano	Merge branch 'jk/shortlog-no-wrap-doc'	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
2013-01-10	Junio C Hamano	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| commitdiff \| raw \| diff to current
2013-01-08	Junio C Hamano	Merge branch 'ta/remove-stale-translated-tut'	blob \| commitdiff \| raw \| diff to current
2013-01-08	Junio C Hamano	Merge branch 'jk/maint-fast-import-doc-dedup-done'	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-18	Junio C Hamano	Merge branch 'er/doc-fast-import-done' into maint	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-09-11	Junio C Hamano	Merge branch 'jc/maint-t7406-rev-parse-max-count-huh...	blob \| commitdiff \| raw \| diff to current
2012-08-27	Junio C Hamano	Merge branch 'jc/maint-t7406-rev-parse-max-count-huh'	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-08-06	Junio C Hamano	Merge branch 'jk/maint-checkout-orphan-check-fix' into...	blob \| commitdiff \| raw \| diff to current
2012-07-28	Junio C Hamano	Merge branch 'jk/maint-checkout-orphan-check-fix'	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-26	Junio C Hamano	Merge branch 'jk/add-p-skip-conflicts' into maint	blob \| commitdiff \| raw \| diff to current
2012-04-20	Junio C Hamano	Merge branch 'jb/am-include'	blob \| commitdiff \| raw \| diff to current
2012-04-16	Junio C Hamano	Merge branch 'jk/add-p-skip-conflicts'	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-29	Junio C Hamano	Merge branch 'tr/maint-mailinfo'	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
2012-01-13	Junio C Hamano	Merge branch 'tr/maint-mailinfo'	blob \| commitdiff \| raw \| diff to current
2012-01-09	Junio C Hamano	Merge branch 'mm/maint-gitweb-project-maxdepth'	blob \| commitdiff \| raw \| diff to current
2011-12-28	Junio C Hamano	Merge branch 'jv/maint-config-set' into maint	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-28	Junio C Hamano	Merge branch 'na/strtoimax' 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
next

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

RSS Atom