Merge branch 'jk/checkout-out-of-unborn' into maint
[gitweb.git] / Documentation / git-merge.txt
2012-11-26 Merge branch 'jk/checkout-out-of-unborn' into maint
2012-11-26 Merge branch 'cn/config-missing-path' into maint
2012-11-26 Merge branch 'jk/maint-gitweb-xss' into maint
2012-11-20 Merge branch 'mg/maint-pull-suggest-upstream-to' into...
2012-11-20 Merge branch 'mm/maint-doc-commit-edit' into maint
2012-11-20 Merge branch 'as/maint-doc-fix-no-post-rewrite' into...
2012-11-20 Merge branch 'rs/lock-correct-ref-during-delete' into...
2012-11-20 Merge branch 'rf/maint-mailmap-off-by-one' into maint
2012-11-20 Merge branch 'jk/maint-diff-grep-textconv' into maint
2012-11-20 Merge branch 'js/format-2047' into maint
2012-11-19 Merge branch 'sz/maint-curl-multi-timeout' into maint
2012-11-19 Merge branch 'po/maint-refs-replace-docs' into maint
2012-11-19 Merge branch 'ph/pull-rebase-detached' into maint
2012-11-19 Merge branch 'mm/maint-doc-remote-tracking' into maint
2012-11-19 Merge branch 'jc/test-say-color-avoid-echo-escape'...
2012-10-25 Documentation: remote tracking branch -> remote-trackin...
2012-10-17 Merge tag 'gitgui-0.17.0' of git://repo.or.cz/git-gui
2012-10-17 Merge branch 'jk/maint-http-half-auth-push' into maint
2012-10-17 Merge branch 'jc/maint-t1450-fsck-order-fix' into maint
2012-10-17 Merge branch 'jc/ll-merge-binary-ours' into maint
2012-10-16 Merge branch 'jk/maint-http-half-auth-push'
2012-10-08 Merge branch 'jc/maint-t1450-fsck-order-fix'
2012-10-08 Merge branch 'jc/merge-bases-paint-fix'
2012-10-08 Merge branch 'os/commit-submodule-ignore' into maint
2012-10-08 Merge branch 'lt/mailinfo-handle-attachment-more-sanely...
2012-10-03 Merge branch 'lt/mailinfo-handle-attachment-more-sanely'
2012-10-01 Merge branch 'os/commit-submodule-ignore'
2012-09-30 Merge branch 'jc/maint-log-grep-all-match-1' into maint
2012-09-30 Merge branch 'jc/maint-mailinfo-mime-attr' into maint
2012-09-25 Merge branch 'jc/maint-mailinfo-mime-attr'
2012-09-24 Merge branch 'jc/maint-blame-no-such-path' into maint
2012-09-24 Merge branch 'dj/fetch-all-tags' into maint
2012-09-21 Merge branch 'jc/maint-log-grep-all-match-1'
2012-09-20 Merge branch 'dg/run-command-child-cleanup' into maint
2012-09-20 Merge branch 'sn/ls-remote-get-url-doc' into maint
2012-09-20 Merge branch 'nd/log-n-doc' into maint
2012-09-18 Merge branch 'jc/maint-log-grep-all-match'
2012-09-18 Merge branch 'er/doc-fast-import-done' into maint
2012-09-17 Merge branch 'jc/maint-blame-no-such-path'
2012-09-15 Merge branch 'jc/ll-merge-binary-ours'
2012-09-15 Merge branch 'dg/run-command-child-cleanup'
2012-09-15 Merge branch 'sb/send-email-reconfirm-fix' into maint
2012-09-15 Merge branch 'jc/send-email-reconfirm' into maint
2012-09-15 Merge branch 'mz/cherry-pick-cmdline-order' into maint
2012-09-15 Merge branch 'rj/test-regex' into maint-1.7.11
2012-09-15 Merge branch 'da/gitk-reload-tag-contents' into maint...
2012-09-15 Merge branch 'jc/maint-checkout-fileglob-doc' into...
2012-09-14 Merge branch 'dj/fetch-all-tags'
2012-09-14 Merge branch 'sn/ls-remote-get-url-doc'
2012-09-12 Merge branch 'jc/maint-checkout-fileglob-doc'
2012-09-12 Merge branch 'sb/send-email-reconfirm-fix'
2012-09-12 Merge branch 'nd/log-n-doc'
2012-09-12 Merge branch 'jc/apply-binary-p0' into maint-1.7.11
2012-09-12 Merge branch 'jc/maint-doc-checkout-b-always-takes...
2012-09-12 Merge branch 'jk/maint-http-half-auth-push' into maint...
2012-09-12 Merge branch 'kk/maint-for-each-ref-multi-sort' into...
2012-09-12 Merge git://ozlabs.org/~paulus/gitk
2012-09-12 Merge branch 'da/gitk-reload-tag-contents'
2012-09-11 Merge branch 'rj/test-regex'
2012-09-11 Merge branch 'jk/argv-array'
2012-09-11 Merge branch 'jc/merge-bases'
2012-09-11 Merge branch 'sz/submodule-force-update' into maint...
2012-09-11 Merge branch 'ph/stash-rerere' into maint-1.7.11
2012-09-11 Merge branch 'jc/maint-sane-execvp-notdir' into maint...
2012-09-11 Merge branch 'jc/maint-config-exit-status' into maint...
2012-09-11 Merge branch 'mh/maint-config-doc-proxy-command' into...
2012-09-11 Merge branch 'mz/empty-rebase-test' into maint-1.7.11
2012-09-11 Merge branch 'jk/docs-docbook-monospace-display' into...
2012-09-11 Merge branch 'ab/diff-write-incomplete-line' into maint...
2012-09-11 Merge branch 'jc/maint-t7406-rev-parse-max-count-huh...
2012-09-11 Merge branch 'rr/precompose-utf8-cleanup' into maint
2012-09-11 Merge branch 'jc/capabilities' into maint
2012-09-11 Merge branch 'jc/doc-git-updates' into maint
2012-09-11 Merge branch 'tr/void-diff-setup-done' into maint-1...
2012-09-11 Merge branch 'tr/merge-recursive-flush' into maint...
2012-09-11 Merge branch 'nd/index-errno' into maint-1.7.11
2012-09-11 Merge branch 'pg/maint-apply-remove-unused-variable...
2012-09-10 Merge branch 'mz/cherry-pick-cmdline-order'
2012-09-10 Merge branch 'mg/rebase-i-onto-reflog-in-full' into...
2012-09-10 Merge branch 'jc/maint-protect-sh-from-ifs' into maint...
2012-09-10 Merge branch 'bc/receive-pack-stdout-protection' into...
2012-09-10 Merge branch 'jk/maint-null-in-trees' into maint-1...
2012-09-10 Merge branch 'tr/maint-send-email-2047' into maint...
2012-09-10 Merge branch 'mm/die-with-dashdash-help' into maint...
2012-09-10 Merge branch 'js/gitweb-path-info-unquote' into maint...
2012-09-07 Merge branch 'jk/maint-http-half-auth-push'
2012-09-07 Merge branch 'jc/maint-doc-checkout-b-always-takes...
2012-09-07 Merge branch 'jc/apply-binary-p0'
2012-09-07 Merge branch 'nd/am-i18n-fix'
2012-09-07 Merge branch 'kk/maint-for-each-ref-multi-sort'
2012-09-07 Merge branch 'lt/commit-tree-guess-utf-8'
2012-09-07 Merge branch 'tr/maint-parseopt-avoid-empty'
2012-09-03 Merge branch 'sz/submodule-force-update'
2012-09-03 Merge branch 'ph/stash-rerere'
2012-09-03 Merge branch 'jc/daemon-access-hook'
2012-09-03 Merge branch 'jc/send-email-reconfirm'
2012-09-03 Merge branch 'cw/cherry-pick-allow-empty-message'
2012-09-03 Merge branch 'jc/maint-sane-execvp-notdir'
2012-09-03 Merge branch 'jc/maint-config-exit-status'
2012-08-29 Merge branch 'rr/precompose-utf8-cleanup'
next