Merge branch 'mw/symlinks' into maint
[git] / Documentation / git-merge-tree.txt
2013-10-30  Junio C HamanoMerge branch 'tr/gitk-doc-update'
2013-10-30  Junio C HamanoMerge branch 'jl/pack-transfer-avoid-double-close'
2013-10-30  Junio C HamanoMerge branch 'sb/git-svn-docs-indent-with-ht'
2013-10-30  Junio C HamanoMerge branch 'nd/magic-pathspec'
2013-10-30  Junio C HamanoMerge branch 'nd/gc-lock-against-each-other'
2013-10-30  Junio C HamanoMerge branch 'hn/log-graph-color-octopus'
2013-10-30  Junio C HamanoMerge branch 'mm/checkout-auto-track-fix'
2013-10-30  Junio C HamanoMerge branch 'sg/t3600-nul-sha1-fix'
2013-10-30  Junio C HamanoMerge branch 'jc/upload-pack-send-symref'
2013-10-30  Junio C HamanoMerge branch 'jk/http-auth-redirects'
2013-10-28  Junio C HamanoSync with v1.8.4.2
2013-10-28  Junio C HamanoMerge branch 'sb/repack-in-c'
2013-10-28  Junio C HamanoMerge branch 'sg/prompt-svn-remote-fix'
2013-10-28  Junio C HamanoMerge branch 'jk/split-broken-ident'
2013-10-28  Junio C HamanoMerge branch 'jk/remote-literal-string-leakfix'
2013-10-28  Junio C HamanoMerge branch 'ew/keepalive'
2013-10-28  Junio C HamanoMerge branch 'jc/revision-range-unpeel'
2013-10-28  Junio C HamanoMerge branch 'jx/relative-path-regression-fix'
2013-10-23  Junio C HamanoSync with 'maint'
2013-10-23  Junio C HamanoMerge branch 'po/dot-url'
2013-10-23  Junio C HamanoMerge branch 'hu/cherry-pick-previous-branch'
2013-10-23  Junio C HamanoMerge branch 'mg/more-textconv'
2013-10-23  Junio C HamanoMerge branch 'jc/pack-objects'
2013-10-18  Junio C HamanoMerge branch 'maint'
2013-10-18  Junio C HamanoMerge branch 'jc/reflog-doc'
2013-10-18  Junio C HamanoMerge branch 'sb/repack-in-c'
2013-10-18  Junio C HamanoMerge branch 'jk/clone-progress-to-stderr'
2013-10-17  Junio C HamanoMerge branch 'jk/format-patch-from'
2013-10-17  Junio C HamanoMerge branch 'es/name-hash-no-trailing-slash-in-dirs'
2013-10-17  Junio C HamanoMerge branch 'jk/trailing-slash-in-pathspec'
2013-10-17  Junio C HamanoMerge branch 'lc/filter-branch-too-many-refs'
2013-10-17  Junio C HamanoMerge branch 'jc/checkout-detach-doc'
2013-10-17  Junio C HamanoSync with maint
2013-10-15  Junio C HamanoMerge branch 'maint'
2013-10-14  Jonathan NiederMerge branch 'rj/highlight-test-hang'
2013-10-14  Jonathan NiederMerge branch 'nv/doc-config-signingkey'
2013-10-14  Jonathan NiederMerge branch 'rj/doc-formatting-fix'
2013-10-14  Jonathan NiederMerge branch 'po/remote-set-head-usage'
2013-10-14  Jonathan NiederMerge branch 'nd/clone-local-with-colon'
2013-10-14  Jonathan NiederMerge branch 'jx/clean-interactive'
2013-10-14  Jonathan NiederMerge branch 'jk/diff-algo'
2013-10-08  Jonathan NiederMerge branch 'tz/credential-netrc'
2013-09-26  Jonathan NiederSync with Git 1.8.4.1
2013-09-25  Jonathan NiederMerge branch 'bc/submodule-status-ignored'
2013-09-25  Jonathan NiederMerge branch 'cc/replace-with-the-same-type'
2013-09-25  Jonathan NiederMerge branch 'kb/msvc-compile'
2013-09-25  Jonathan NiederMerge branch 'nd/unpack-entry-optim-in-pack-objects'
2013-09-25  Jonathan NiederMerge branch 'jk/shortlog-tolerate-broken-commit'
2013-09-25  Jonathan NiederMerge branch 'jc/strcasecmp-pure-inline'
2013-09-25  Jonathan NiederMerge branch 'nd/fetch-pack-error-reporting-fix'
2013-09-25  Jonathan NiederMerge branch 'es/contacts-in-subdir'
2013-09-25  Jonathan NiederMerge branch 'jc/push-cas'
2013-09-25  Jonathan NiederMerge branch 'maint'
2013-09-20  Junio C HamanoMerge branch 'jk/upload-pack-keepalive'
2013-09-20  Junio C HamanoMerge branch 'fc/at-head'
2013-09-20  Junio C HamanoMerge branch 'dw/check-ignore-sans-index'
2013-09-20  Junio C HamanoMerge branch 'mm/commit-template-squelch-advice-messages'
2013-09-20  Junio C HamanoMerge branch 'bk/refs-multi-update'
2013-09-20  Junio C HamanoMerge branch 'nr/git-cd-to-a-directory'
2013-09-20  Junio C HamanoMerge branch 'mm/rebase-continue-freebsd-WB'
2013-09-20  Junio C HamanoMerge branch 'jh/checkout-auto-tracking'
2013-09-20  Junio C HamanoMerge branch 'bc/http-backend-allow-405'
2013-09-20  Junio C HamanoMerge branch 'np/lookup-object-hashing'
2013-09-20  Junio C HamanoMerge branch 'hu/cherry-pick-previous-branch'
2013-09-20  Junio C HamanoMerge branch 'mm/status-without-comment-char'
2013-09-20  Junio C HamanoMerge branch 'rh/peeling-tag-to-tag'
2013-09-20  Junio C HamanoMerge branch 'jx/branch-vv-always-compare-with-upstream'
2013-09-20  Junio C HamanoMerge branch 'nd/fetch-into-shallow'
2013-09-19  Junio C HamanoMerge branch 'jk/config-int-range-check'
2013-09-18  Junio C HamanoMerge branch 'maint'
2013-09-18  Junio C HamanoMerge branch 'jc/url-match'
2013-09-18  Junio C HamanoMerge branch 'jc/cvsserver-perm-bit-fix'
2013-09-18  Junio C HamanoMerge branch 'bc/send-email-ssl-die-message-fix'
2013-09-18  Junio C HamanoMerge branch 'uh/git-svn-serf-fix'
2013-09-18  Junio C HamanoMerge branch 'fc/contrib-bzr-hg-fixes'
2013-09-18  Junio C HamanoMerge branch 'js/add-i-mingw'
2013-09-18  Junio C HamanoMerge branch 'ks/p4-view-spec'
2013-09-18  Junio C HamanoMerge branch 'jk/duplicate-objects-in-packs'
2013-09-18  Junio C HamanoMerge branch 'nd/git-dir-pointing-at-gitfile'
2013-09-18  Junio C HamanoMerge branch 'jk/pager-bypass-cat-for-default-pager'
2013-09-18  Junio C HamanoMerge branch 'fc/t3200-fixes'
2013-09-18  Junio C HamanoMerge branch 'fc/rev-parse-test-updates'
2013-09-17  Junio C HamanoMerge branch 'jk/remove-remote-helpers-in-python'
2013-09-17  Junio C HamanoMerge branch 'ss/doclinks'
2013-09-17  Junio C HamanoMerge branch 'rh/ishes-doc'
2013-09-04  Richard Hansenuse 'tree-ish' instead of 'treeish'
2013-06-17  Junio C HamanoMerge tag 'gitgui-0.18.0' of git://repo.or.cz/git-gui
2013-05-17  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-05-13  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-04-03  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup' into maint...
2013-03-28  Junio C HamanoMerge branch 'jc/remove-treesame-parent-in-simplify...
2013-03-28  Junio C HamanoMerge branch 'jk/checkout-attribute-lookup'
2013-02-04  Junio C HamanoMerge branch 'dl/am-hg-locale' into maint
2013-01-30  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-28  Junio C HamanoMerge branch 'dl/am-hg-locale'
2013-01-23  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-reorder' into...
2013-01-14  Junio C HamanoMerge branch 'jk/shortlog-no-wrap-doc' into maint
2013-01-14  Junio C HamanoMerge branch 'jk/maint-fast-import-doc-dedup-done'...
2013-01-14  Junio C HamanoMerge branch 'jl/interrupt-clone-remove-separate-git...
next