Merge branch 'mg/killed-merge'
[git/git.git] / Documentation / git-merge.txt
2017-08-27 Junio C HamanoMerge branch 'mg/killed-merge'
2017-08-27 Junio C HamanoMerge branch 'jt/packmigrate'
2017-08-27 Junio C HamanoMerge branch 'mh/ref-lock-entry'
2017-08-27 Junio C HamanoMerge branch 'jt/doc-pack-objects-fix'
2017-08-27 Junio C HamanoMerge branch 'jc/cutoff-config'
2017-08-27 Junio C HamanoMerge branch 'kw/write-index-reduce-alloc'
2017-08-27 Junio C HamanoMerge branch 'bw/submodule-config-cleanup'
2017-08-27 Junio C HamanoMerge branch 'js/gitweb-raw-blob-link-in-history'
2017-08-27 Junio C HamanoMerge branch 'po/object-id'
2017-08-27 Junio C HamanoMerge branch 'jn/vcs-svn-cleanup'
2017-08-27 Junio C HamanoMerge branch 'bc/vcs-svn-cleanup'
2017-08-27 Junio C HamanoMerge branch 'tb/apply-with-crlf'
2017-08-27 Junio C HamanoMerge branch 'jt/stash-tests'
2017-08-27 Junio C HamanoMerge branch 'jk/trailers-parse'
2017-08-27 Junio C HamanoMerge branch 'pb/trailers-from-command-line'
2017-08-27 Junio C HamanoMerge branch 'jt/diff-color-move-fix'
2017-08-27 Junio C HamanoMerge branch 'sb/diff-color-move'
2017-08-24 Junio C HamanoMerge branch 'jk/doc-the-this'
2017-08-24 Junio C HamanoMerge branch 'rs/commit-h-single-parent-cleanup'
2017-08-24 Junio C HamanoMerge branch 'jc/simplify-progress'
2017-08-24 Junio C HamanoMerge branch 'tc/curl-with-backports'
2017-08-24 Junio C HamanoMerge branch 'cc/subprocess-handshake-missing-capabilities'
2017-08-24 Junio C HamanoMerge branch 'rs/object-id'
2017-08-24 Junio C HamanoMerge branch 'lg/merge-signoff'
2017-08-23 Junio C HamanoMerge branch 'dc/fmt-merge-msg-microcleanup' into maint
2017-08-23 Junio C HamanoMerge branch 'ah/doc-wserrorhighlight' into maint
2017-08-23 Junio C HamanoMerge branch 'cc/ref-is-hidden-microcleanup' into maint
2017-08-23 Junio C HamanoMerge branch 'js/run-process-parallel-api-fix' into...
2017-08-23 Junio C HamanoMerge branch 'rs/stat-data-unaligned-reads-fix' into...
2017-08-23 Junio C HamanoMerge branch 'rs/bswap-ubsan-fix' into maint
2017-08-23 Junio C HamanoMerge branch 'dl/credential-cache-socket-in-xdg-cache...
2017-08-23 Junio C HamanoMerge branch 'jc/http-sslkey-and-ssl-cert-are-paths...
2017-08-23 Junio C HamanoMerge branch 'sb/submodule-parallel-update'
2017-08-23 Junio C HamanoMerge branch 'hv/t5526-andand-chain-fix'
2017-08-23 Junio C HamanoMerge branch 'as/grep-quiet-no-match-exit-code-fix'
2017-08-23 Junio C HamanoMerge branch 'kw/commit-keep-index-when-pre-commit...
2017-08-23 Junio C HamanoMerge branch 'sb/sha1-file-cleanup'
2017-08-23 Junio C HamanoMerge branch 'rs/t1002-do-not-use-sum'
2017-08-23 Junio C HamanoMerge branch 'ah/doc-empty-string-is-false'
2017-08-22 Junio C HamanoMerge branch 'rs/unpack-entry-leakfix'
2017-08-22 Junio C HamanoMerge branch 'rs/strbuf-getwholeline-fix'
2017-08-22 Junio C HamanoMerge branch 'rs/fsck-obj-leakfix'
2017-08-22 Junio C HamanoMerge branch 'rs/t4062-obsd'
2017-08-22 Junio C HamanoMerge branch 'rs/find-pack-entry-bisection'
2017-08-22 Junio C HamanoMerge branch 'rs/apply-lose-prefix-length'
2017-08-22 Junio C HamanoMerge branch 'rj/add-chmod-error-message'
2017-08-22 Junio C HamanoMerge branch 'jk/hashcmp-memcmp'
2017-08-22 Junio C HamanoMerge branch 'jk/drop-sha1-entry-pos'
2017-08-22 Junio C HamanoMerge branch 'rs/t3700-clean-leftover'
2017-08-22 Junio C HamanoMerge branch 'jc/perl-git-comment-typofix'
2017-08-22 Junio C HamanoMerge branch 'rs/obsd-getcwd-workaround'
2017-08-22 Junio C HamanoMerge branch 'ma/parse-maybe-bool'
2017-08-22 Junio C HamanoMerge branch 'ab/ref-filter-no-contains'
2017-08-22 Michael J GruberDocumentation/git-merge: explain --continue
2017-08-11 Junio C HamanoMerge branch 'dl/credential-cache-socket-in-xdg-cache'
2017-08-11 Junio C HamanoMerge branch 'dc/fmt-merge-msg-microcleanup'
2017-08-11 Junio C HamanoMerge branch 'ah/doc-wserrorhighlight'
2017-08-11 Junio C HamanoMerge branch 'cc/ref-is-hidden-microcleanup'
2017-08-11 Junio C HamanoMerge branch 'js/run-process-parallel-api-fix'
2017-08-11 Junio C HamanoMerge branch 'jc/http-sslkey-and-ssl-cert-are-paths'
2017-08-11 Junio C HamanoMerge branch 'rs/stat-data-unaligned-reads-fix'
2017-08-11 Junio C HamanoMerge branch 'rs/bswap-ubsan-fix'
2017-08-04 Junio C HamanoMerge branch 'ah/patch-id-doc'
2017-08-01 Junio C HamanoMerge tag 'v2.12.4' into maint
2017-07-31 Junio C HamanoMerge branch 'jn/hooks-pre-rebase-sample-fix' into...
2017-07-31 Junio C HamanoMerge branch 'rs/apply-avoid-over-reading' into maint
2017-07-30 Junio C HamanoMerge tag 'v2.11.3' into maint-2.12
2017-07-30 Junio C HamanoMerge tag 'v2.8.6' into maint-2.9
2017-07-25 Junio C HamanoMerge branch 'js/msgfmt-on-windows' of ../git-gui into...
2017-07-25 Łukasz Gryglickimerge: add a --signoff flag
2017-07-21 Junio C HamanoMerge branch 'ew/fd-cloexec-fix' into maint
2017-07-21 Junio C HamanoMerge branch 'ks/fix-rebase-doc-picture' into maint
2017-07-21 Junio C HamanoMerge branch 'bb/unicode-10.0' into maint
2017-07-20 Junio C HamanoMerge branch 'ew/fd-cloexec-fix'
2017-07-18 Junio C HamanoMerge branch 'jn/hooks-pre-rebase-sample-fix'
2017-07-12 Junio C HamanoMerge branch 'kn/ref-filter-branch-list' into maint
2017-07-12 Junio C HamanoMerge branch 'ks/fix-rebase-doc-picture'
2017-07-12 Junio C HamanoMerge branch 'kn/ref-filter-branch-list'
2017-07-12 Junio C HamanoMerge branch 'rs/apply-avoid-over-reading'
2017-07-10 Junio C HamanoMerge branch 'jc/utf8-fprintf' into maint
2017-07-10 Junio C HamanoMerge branch 'js/fsck-name-object' into maint
2017-07-10 Junio C HamanoMerge branch 'js/t5534-rev-parse-gives-multi-line-outpu...
2017-07-10 Junio C HamanoMerge branch 'aw/contrib-subtree-doc-asciidoctor' into...
2017-07-10 Junio C HamanoMerge branch 'ah/doc-pretty-color-auto-prefix' into...
2017-07-10 Junio C HamanoMerge branch 'mb/reword-autocomplete-message' into...
2017-07-10 Junio C HamanoMerge branch 'ks/t7508-indent-fix' into maint
2017-07-10 Junio C HamanoMerge branch 'sb/t4005-modernize' into maint
2017-07-10 Junio C HamanoMerge branch 'rs/apply-validate-input' into maint
2017-07-10 Junio C HamanoMerge branch 'jc/pack-bitmap-unaligned' into maint
2017-07-10 Junio C HamanoMerge branch 'pw/rebase-i-regression-fix-tests' into...
2017-07-10 Junio C HamanoMerge branch 'jk/add-p-commentchar-fix' into maint
2017-07-10 Junio C HamanoMerge branch 'rs/pretty-add-again' into maint
2017-07-10 Junio C HamanoMerge branch 'bb/unicode-10.0'
2017-07-07 Junio C HamanoMerge branch 'js/t5534-rev-parse-gives-multi-line-outpu...
2017-07-07 Junio C HamanoMerge branch 'rs/apply-avoid-over-reading'
2017-07-07 Junio C HamanoMerge branch 'jc/utf8-fprintf'
2017-07-07 Junio C HamanoMerge branch 'js/fsck-name-object'
2017-07-07 Junio C HamanoMerge branch 'aw/contrib-subtree-doc-asciidoctor'
2017-06-30 Junio C HamanoMerge branch 'rs/apply-validate-input'
2017-06-30 Junio C HamanoMerge branch 'jc/pack-bitmap-unaligned'
next