Merge branch 'jc/usage-stdin'
[gitweb.git] / Documentation / git-merge.txt
2015-10-26 Merge branch 'mr/worktree-list'
2015-10-26 Merge branch 'jc/am-3-fallback-regression-fix'
2015-10-20 Merge branch 'tb/t0027-crlf'
2015-10-20 Merge branch 'ls/p4-test-updates'
2015-10-20 Merge branch 'jk/war-on-sprintf'
2015-10-20 Merge branch 'js/gc-with-stale-symref' into maint
2015-10-20 Merge branch 'rd/test-path-utils' into maint
2015-10-20 Merge branch 'jc/doc-gc-prune-now' into maint
2015-10-20 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-19 Merge branch 'maint' of git://github.com/git-l10n/git...
2015-10-16 Merge branch 'jc/doc-gc-prune-now'
2015-10-16 Merge branch 'sb/submodule-config-parse'
2015-10-16 Merge branch 'jk/filter-branch-use-of-sed-on-incomplete...
2015-10-16 Merge branch 'rd/test-path-utils'
2015-10-16 Merge branch 'cc/quote-comments' into maint
2015-10-16 Merge branch 'es/worktree-add-cleanup' into maint
2015-10-16 Merge branch 'tk/doc-interpret-trailers-grammo' into...
2015-10-16 Merge branch 'tk/typofix-connect-unknown-proto-error...
2015-10-16 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-16 Merge branch 'nd/ls-remote-does-not-have-u-option'...
2015-10-16 Merge branch 'jc/fsck-dropped-errors' into maint
2015-10-16 Merge branch 'sb/http-flaky-test-fix' into maint
2015-10-16 Merge branch 'sb/perf-without-installed-git' into maint
2015-10-16 Merge branch 'js/icase-wt-detection' into maint
2015-10-16 Merge branch 'pt/am-builtin' into maint
2015-10-16 Merge branch 'mm/detach-at-HEAD-reflog' into maint
2015-10-16 Merge branch 'gr/rebase-i-drop-warn' into maint
2015-10-16 Merge branch 'dt/log-follow-config' into maint
2015-10-16 Merge branch 'ti/glibc-stdio-mutex-from-signal-handler...
2015-10-16 Merge branch 'jk/notes-dwim-doc' into maint
2015-10-16 Merge branch 'jk/make-findstring-makeflags-fix' into...
2015-10-16 Merge branch 'jw/make-arflags-customizable' into maint
2015-10-16 Merge branch 'jk/connect-clear-env' into maint
2015-10-16 Merge branch 'jk/blame-first-parent' into maint
2015-10-16 Merge branch 'mm/keyid-docs' into maint
2015-10-16 Merge branch 'pt/pull-builtin' into maint
2015-10-15 Merge branch 'ls/p4-lfs'
2015-10-15 Merge branch 'js/gc-with-stale-symref'
2015-10-15 Merge branch 'js/clone-dissociate'
2015-10-15 Merge branch 'tk/doc-interpret-trailers-grammo'
2015-10-15 Merge branch 'es/worktree-add-cleanup'
2015-10-15 Merge branch 'dt/log-follow-config'
2015-10-15 Merge branch 'cc/quote-comments'
2015-10-15 Merge branch 'gr/rebase-i-drop-warn'
2015-10-15 Merge branch 'mm/detach-at-HEAD-reflog'
2015-10-15 Merge branch 'sa/send-email-smtp-batch-data-limit'
2015-10-15 Merge branch 'pt/am-builtin'
2015-10-15 Merge branch 'nd/clone-linked-checkout'
2015-10-15 Merge branch 'js/icase-wt-detection'
2015-10-15 Merge branch 'kn/for-each-branch'
2015-10-15 Merge branch 'sb/perf-without-installed-git'
2015-10-15 Merge branch 'sb/http-flaky-test-fix'
2015-10-15 Merge branch 'jc/fsck-dropped-errors'
2015-10-15 Merge branch 'ls/p4-translation-failure'
2015-10-15 Merge branch 'nd/gc-auto-background-fix'
2015-10-15 Merge branch 'mk/submodule-gitdir-path'
2015-10-14 Merge branch 'pt/pull-builtin'
2015-10-14 Merge branch 'nd/ls-remote-does-not-have-u-option'
2015-10-14 Merge branch 'jk/asciidoctor-section-heading-markup...
2015-10-14 Merge branch 'tk/typofix-connect-unknown-proto-error'
2015-10-14 Merge branch 'jk/notes-dwim-doc'
2015-10-07 Merge branch 'ls/p4-path-encoding'
2015-10-07 Merge branch 'gb/filter-branch-progress'
2015-10-07 Merge branch 'nd/ignore-then-not-ignore'
2015-10-07 Merge branch 'ti/glibc-stdio-mutex-from-signal-handler'
2015-10-05 Sync with 2.6.1
2015-10-05 Merge branch 'mm/keyid-docs'
2015-10-05 Merge branch 'bb/remote-get-url'
2015-10-05 Merge branch 'jk/blame-first-parent'
2015-10-05 Merge branch 'jw/make-arflags-customizable'
2015-10-05 Merge branch 'jk/rebase-no-autostash'
2015-10-05 Merge branch 'jk/make-findstring-makeflags-fix'
2015-10-05 Merge branch 'sb/submodule-helper'
2015-10-05 Merge branch 'kn/for-each-tag'
2015-10-05 Merge branch 'jk/test-lint-forbid-when-finished-in...
2015-10-05 Merge branch 'jk/interpret-trailers-outside-a-repository'
2015-10-05 Merge branch 'as/subtree-with-spaces'
2015-10-05 Merge branch 'jk/connect-clear-env'
2015-10-05 Merge branch 'jk/date-local'
2015-10-05 Merge branch 'dt/refs-bisection'
2015-10-05 Merge branch 'nk/stash-show-config'
2015-10-05 Merge branch 'jk/async-pkt-line'
2015-10-05 Merge branch 'jh/quiltimport-explicit-series-file'
2015-10-05 Merge branch 'ld/p4-import-labels'
2015-10-05 Merge branch 'ad/bisect-terms'
2015-10-05 Merge branch 'jc/rerere'
2015-10-05 Merge branch 'kn/for-each-tag-branch'
2015-09-29 Sync with v2.5.4
2015-09-28 Sync with 2.4.10
2015-09-28 Sync with 2.3.10
2015-09-21 Merge branch 'rj/mailmap-ramsay'
2015-09-21 Merge branch 'bn/send-email-smtp-auth-error-message...
2015-09-21 Merge tag 'l10n-2.6.0-rnd2+de' of git://github.com...
2015-09-21 Documentation: explain optional arguments better
2015-09-21 Documentation: use 'keyid' consistently, not 'key-id'
2015-09-17 Sync with 2.5.3
2015-09-17 Merge branch 'po/doc-branch-desc'
2015-09-17 Merge branch 'as/config-doc-markup-fix'
2015-09-17 Merge branch 'br/svn-doc-include-paths-config' into...
2015-09-17 Merge branch 'ah/submodule-typofix-in-error' into maint
next