Andrew's git - gitweb.git/history - Documentation/git-merge-tree.txt

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

2013-09-20	Merge branch 'jk/upload-pack-keepalive'	blob \| diff \| raw
2013-09-20	Merge branch 'fc/at-head'	blob \| diff \| raw
2013-09-20	Merge branch 'dw/check-ignore-sans-index'	blob \| diff \| raw
2013-09-20	Merge branch 'mm/commit-template-squelch-advice-messages'	blob \| diff \| raw
2013-09-20	Merge branch 'bk/refs-multi-update'	blob \| diff \| raw
2013-09-20	Merge branch 'nr/git-cd-to-a-directory'	blob \| diff \| raw
2013-09-20	Merge branch 'mm/rebase-continue-freebsd-WB'	blob \| diff \| raw
2013-09-20	Merge branch 'jh/checkout-auto-tracking'	blob \| diff \| raw
2013-09-20	Merge branch 'bc/http-backend-allow-405'	blob \| diff \| raw
2013-09-20	Merge branch 'np/lookup-object-hashing'	blob \| diff \| raw
2013-09-20	Merge branch 'hu/cherry-pick-previous-branch'	blob \| diff \| raw
2013-09-20	Merge branch 'mm/status-without-comment-char'	blob \| diff \| raw
2013-09-20	Merge branch 'rh/peeling-tag-to-tag'	blob \| diff \| raw
2013-09-20	Merge branch 'jx/branch-vv-always-compare-with-upstream'	blob \| diff \| raw
2013-09-20	Merge branch 'nd/fetch-into-shallow'	blob \| diff \| raw
2013-09-19	Merge branch 'jk/config-int-range-check'	blob \| diff \| raw
2013-09-18	Merge branch 'maint'	blob \| diff \| raw
2013-09-18	Merge branch 'jc/url-match'	blob \| diff \| raw
2013-09-18	Merge branch 'jc/cvsserver-perm-bit-fix'	blob \| diff \| raw
2013-09-18	Merge branch 'bc/send-email-ssl-die-message-fix'	blob \| diff \| raw
2013-09-18	Merge branch 'uh/git-svn-serf-fix'	blob \| diff \| raw
2013-09-18	Merge branch 'fc/contrib-bzr-hg-fixes'	blob \| diff \| raw
2013-09-18	Merge branch 'js/add-i-mingw'	blob \| diff \| raw
2013-09-18	Merge branch 'ks/p4-view-spec'	blob \| diff \| raw
2013-09-18	Merge branch 'jk/duplicate-objects-in-packs'	blob \| diff \| raw
2013-09-18	Merge branch 'nd/git-dir-pointing-at-gitfile'	blob \| diff \| raw
2013-09-18	Merge branch 'jk/pager-bypass-cat-for-default-pager'	blob \| diff \| raw
2013-09-18	Merge branch 'fc/t3200-fixes'	blob \| diff \| raw
2013-09-18	Merge branch 'fc/rev-parse-test-updates'	blob \| diff \| raw
2013-09-17	Merge branch 'jk/remove-remote-helpers-in-python'	blob \| diff \| raw
2013-09-17	Merge branch 'ss/doclinks'	blob \| diff \| raw
2013-09-17	Merge branch 'rh/ishes-doc'	blob \| diff \| raw
2013-09-04	use 'tree-ish' instead of 'treeish'	blob \| diff \| raw
2013-06-17	Merge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2013-05-17	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-05-13	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-04-03	Merge branch 'jk/checkout-attribute-lookup' into maint...	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'jc/remove-treesame-parent-in-simplify...	blob \| diff \| raw \| diff to current
2013-03-28	Merge branch 'jk/checkout-attribute-lookup'	blob \| diff \| raw \| diff to current
2013-02-04	Merge branch 'dl/am-hg-locale' into maint	blob \| diff \| raw \| diff to current
2013-01-30	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-01-28	Merge branch 'dl/am-hg-locale'	blob \| diff \| raw \| diff to current
2013-01-23	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jk/maint-fast-import-doc-reorder' into...	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jk/shortlog-no-wrap-doc' into maint	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jk/maint-fast-import-doc-dedup-done'...	blob \| diff \| raw \| diff to current
2013-01-14	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| diff \| raw \| diff to current
2013-01-12	Merge branch 'jk/maint-fast-import-doc-reorder'	blob \| diff \| raw \| diff to current
2013-01-12	Merge branch 'jk/shortlog-no-wrap-doc'	blob \| diff \| raw \| diff to current
2013-01-10	Merge branch 'ta/remove-stale-translated-tut' into...	blob \| diff \| raw \| diff to current
2013-01-10	Merge branch 'jl/interrupt-clone-remove-separate-git...	blob \| diff \| raw \| diff to current
2013-01-08	Merge branch 'ta/remove-stale-translated-tut'	blob \| diff \| raw \| diff to current
2013-01-08	Merge branch 'jk/maint-fast-import-doc-dedup-done'	blob \| diff \| raw \| diff to current
2012-10-17	Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui	blob \| diff \| raw \| diff to current
2012-10-08	Merge branch 'os/commit-submodule-ignore' into maint	blob \| diff \| raw \| diff to current
2012-10-01	Merge branch 'os/commit-submodule-ignore'	blob \| diff \| raw \| diff to current
2012-09-18	Merge branch 'er/doc-fast-import-done' into maint	blob \| diff \| raw \| diff to current
2012-09-15	Merge branch 'da/gitk-reload-tag-contents' into maint...	blob \| diff \| raw \| diff to current
2012-09-12	Merge git://ozlabs.org/~paulus/gitk	blob \| diff \| raw \| diff to current
2012-09-12	Merge branch 'da/gitk-reload-tag-contents'	blob \| diff \| raw \| diff to current
2012-09-11	Merge branch 'jc/maint-t7406-rev-parse-max-count-huh...	blob \| diff \| raw \| diff to current
2012-08-27	Merge branch 'jc/maint-t7406-rev-parse-max-count-huh'	blob \| diff \| raw \| diff to current
2012-08-24	Merge branch 'lp/no-cmd-http-fetch' into maint-1.7.11	blob \| diff \| raw \| diff to current
2012-08-06	Merge branch 'jn/block-sha1' into maint	blob \| diff \| raw \| diff to current
2012-08-06	Merge branch 'ms/daemon-doc-typo' into maint	blob \| diff \| raw \| diff to current
2012-08-06	Merge branch 'lm/git-blame-el' into maint	blob \| diff \| raw \| diff to current
2012-08-06	Merge branch 'jk/maint-checkout-orphan-check-fix' into...	blob \| diff \| raw \| diff to current
2012-07-28	Merge branch 'jk/maint-checkout-orphan-check-fix'	blob \| diff \| raw \| diff to current
2012-07-24	Merge branch 'jn/block-sha1'	blob \| diff \| raw \| diff to current
2012-07-22	Merge branch 'jk/maint-commit-amend-only-no-paths'...	blob \| diff \| raw \| diff to current
2012-07-22	Merge branch 'tg/maint-cache-name-compare' into maint	blob \| diff \| raw \| diff to current
2012-07-22	Merge branch 'ms/daemon-doc-typo'	blob \| diff \| raw \| diff to current
2012-07-16	Merge branch 'tg/maint-cache-name-compare'	blob \| diff \| raw \| diff to current
2012-07-16	Merge branch 'jk/maint-commit-amend-only-no-paths'	blob \| diff \| raw \| diff to current
2012-07-11	Merge branch 'tg/maint-cache-name-compare' into tg...	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'lp/no-cmd-http-fetch'	blob \| diff \| raw \| diff to current
2012-06-25	Merge branch 'lm/git-blame-el'	blob \| diff \| raw \| diff to current
2012-06-17	Merge branch 'js/maint-fast-export-mark-error' into...	blob \| diff \| raw \| diff to current
2012-06-12	Merge branch 'js/maint-fast-export-mark-error'	blob \| diff \| raw \| diff to current
2012-06-03	Merge branch 'ef/maint-rebase-error-message' into maint	blob \| diff \| raw \| diff to current
2012-06-01	Merge branch 'ef/maint-rebase-error-message'	blob \| diff \| raw \| diff to current
2012-05-23	Merge branch 'js/rev-parse-doc-fix'	blob \| diff \| raw \| diff to current
2012-05-23	Merge branch 'js/rebase-i-p-test-fix'	blob \| diff \| raw \| diff to current
2012-04-26	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| diff \| raw \| diff to current
2012-04-26	Merge branch 'jk/add-p-skip-conflicts' into maint	blob \| diff \| raw \| diff to current
2012-04-20	Merge branch 'jb/am-include'	blob \| diff \| raw \| diff to current
2012-04-16	Merge branch 'jk/add-p-skip-conflicts'	blob \| diff \| raw \| diff to current
2012-04-16	Merge branch 'rs/combine-diff-zero-context-at-the-begin...	blob \| diff \| raw \| diff to current
2012-04-10	Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...	blob \| diff \| raw \| diff to current
2012-04-02	Merge branch 'pt/gitk'	blob \| diff \| raw \| diff to current
2012-03-26	Merge branch 'jn/maint-fast-import-empty-ls' into maint	blob \| diff \| raw \| diff to current
2012-03-24	Merge gitk changes from Paul Mackerras at git://ozlabs...	blob \| diff \| raw \| diff to current
2012-03-16	Merge "two fixes for fast-import's 'ls' command" from...	blob \| diff \| raw \| diff to current
2012-03-16	Merge branch 'th/doc-diff-submodule-option'	blob \| diff \| raw \| diff to current
2012-03-12	Merge branch 'jc/maint-diff-patch-header' into maint	blob \| diff \| raw \| diff to current
2012-03-06	Merge branch 'jc/maint-diff-patch-header'	blob \| diff \| raw \| diff to current
2012-02-27	Merge branch 'pj/remote-set-branches-usage-fix' into...	blob \| diff \| raw \| diff to current
2012-02-23	Merge branch 'pj/remote-set-branches-usage-fix'	blob \| diff \| raw \| diff to current
2012-02-16	Merge branch 'mm/empty-loose-error-message' into maint	blob \| diff \| raw \| diff to current
2012-02-13	Merge branch 'mm/empty-loose-error-message'	blob \| diff \| raw \| diff to current
next