doc: update the order of the syntax `git merge --continue`
[git/git.git] / Documentation / git-merge.txt
2018-06-14 Meng-Sung Wudoc: update the order of the syntax `git merge --continue`
2017-03-30 Junio C HamanoMerge branch 'jc/merge-drop-old-syntax'
2017-03-28 Junio C HamanoMerge branch 'jh/memihash-opt'
2017-03-28 Junio C HamanoMerge branch 'sg/skip-prefix-in-prettify-refname'
2017-03-28 Junio C HamanoMerge branch 'tg/stash-push-fixup'
2017-03-28 Junio C HamanoMerge branch 'bw/grep-recurse-submodules'
2017-03-28 Junio C HamanoMerge branch 'km/config-grammofix' into maint
2017-03-28 Junio C HamanoMerge branch 'sb/submodule-update-initial-runs-custom...
2017-03-28 Junio C HamanoMerge branch 'jk/quote-env-path-list-component' into...
2017-03-28 Junio C HamanoMerge branch 'rs/update-hook-optim' into maint
2017-03-28 Junio C HamanoMerge branch 'rs/path-name-safety-cleanup' into maint
2017-03-28 Junio C HamanoMerge branch 'rs/http-push-cleanup' into maint
2017-03-28 Junio C HamanoMerge branch 'rs/blame-code-cleanup' into maint
2017-03-28 Junio C HamanoMerge branch 'st/verify-tag' into maint
2017-03-28 Junio C HamanoMerge branch 'js/regexec-buf' into maint
2017-03-28 Junio C HamanoMerge branch 'jk/execv-dashed-external' into maint
2017-03-28 Junio C HamanoMerge branch 'dp/filter-branch-prune-empty' into maint
2017-03-28 Junio C HamanoMerge branch 'mm/fetch-show-error-message-on-unadvertis...
2017-03-28 Junio C HamanoMerge branch 'jk/interpret-branch-name' into maint
2017-03-28 Junio C HamanoMerge branch 'ab/cond-skip-tests' into maint
2017-03-28 Junio C HamanoMerge branch 'jk/ident-empty' into maint
2017-03-28 Junio C HamanoMerge branch 'jk/delta-chain-limit' into maint
2017-03-28 Junio C HamanoMerge branch 'rs/strbuf-add-real-path' into maint
2017-03-28 Junio C HamanoMerge branch 'jk/parse-config-key-cleanup' into maint
2017-03-27 Junio C HamanoMerge branch 'km/config-grammofix'
2017-03-27 Junio C HamanoMerge branch 'st/verify-tag'
2017-03-27 Junio C HamanoMerge branch 'sb/submodule-update-initial-runs-custom...
2017-03-27 Junio C HamanoMerge branch 'jk/quote-env-path-list-component'
2017-03-24 Junio C HamanoMerge branch 'rs/update-hook-optim'
2017-03-24 Junio C HamanoMerge branch 'rs/path-name-safety-cleanup'
2017-03-24 Junio C HamanoMerge branch 'rs/http-push-cleanup'
2017-03-24 Junio C HamanoMerge branch 'js/regexec-buf'
2017-03-24 Junio C HamanoMerge branch 'jk/execv-dashed-external'
2017-03-24 Junio C HamanoMerge branch 'jc/config-case-cmdline-take-2' into maint
2017-03-24 Junio C HamanoMerge branch 'jn/remote-helpers-with-git-dir' into...
2017-03-24 Junio C HamanoMerge branch 'sb/submodule-config-parse-ignore-fix...
2017-03-24 Junio C HamanoMerge branch 'jk/push-deadlock-regression-fix' into...
2017-03-21 Junio C HamanoMerge branch 'sb/submodule-config-parse-ignore-fix'
2017-03-21 Junio C HamanoMerge branch 'jh/send-email-one-cc' into maint
2017-03-21 Junio C HamanoMerge branch 'jk/t6300-cleanup' into maint
2017-03-21 Junio C HamanoMerge branch 'rs/commit-parsing-optim' into maint
2017-03-21 Junio C HamanoMerge branch 'jk/show-branch-lift-name-len-limit' into...
2017-03-21 Junio C HamanoMerge branch 'jk/tempfile-ferror-fclose-confusion'...
2017-03-21 Junio C HamanoMerge branch 'rl/remote-allow-missing-branch-name-merge...
2017-03-21 Junio C HamanoMerge branch 'dt/gc-ignore-old-gc-logs' into maint
2017-03-21 Junio C HamanoMerge branch 'jt/upload-pack-error-report' into maint
2017-03-21 Junio C HamanoMerge branch 'rs/sha1-file-plug-fallback-base-leak...
2017-03-21 Junio C HamanoMerge branch 'jc/diff-populate-filespec-size-only-fix...
2017-03-21 Junio C HamanoMerge branch 'mg/status-porcelain-no-i18n' into maint
2017-03-21 Junio C HamanoMerge branch 'ew/markdown-url-in-readme' into maint
2017-03-21 Junio C HamanoMerge branch 'jk/ewah-use-right-type-in-sizeof' into...
2017-03-20 Junio C HamanoMerge branch 'js/difftool-builtin'
2017-03-17 Junio C HamanoMerge branch 'jk/cherry-pick-0-mainline'
2017-03-17 Junio C HamanoMerge branch 'mg/status-porcelain-no-i18n'
2017-03-17 Junio C HamanoMerge branch 'rs/blame-code-cleanup'
2017-03-17 Junio C HamanoMerge branch 'cc/split-index-config'
2017-03-16 Junio C HamanoMerge branch 'mm/two-more-xstrfmt' into maint
2017-03-16 Junio C HamanoMerge branch 'vn/line-log-memcpy-size-fix' into maint
2017-03-16 Junio C HamanoMerge branch 'ax/line-log-range-merge-fix' into maint
2017-03-16 Junio C HamanoMerge branch 'js/travis-32bit-linux' into maint
2017-03-16 Junio C HamanoMerge branch 'jh/mingw-openssl-sha1' into maint
2017-03-16 Junio C HamanoMerge branch 'jk/http-auth' into maint
2017-03-14 Junio C HamanoMerge branch 'kn/ref-filter-branch-list'
2017-03-14 Junio C HamanoMerge branch 'jk/push-deadlock-regression-fix'
2017-03-14 Junio C HamanoMerge branch 'js/travis-32bit-linux'
2017-03-14 Junio C HamanoMerge branch 'dp/filter-branch-prune-empty'
2017-03-14 Junio C HamanoMerge branch 'mm/fetch-show-error-message-on-unadvertis...
2017-03-14 Junio C HamanoMerge branch 'jk/interpret-branch-name'
2017-03-14 Junio C HamanoMerge branch 'ab/cond-skip-tests'
2017-03-13 Junio C HamanoMerge branch 'jc/diff-populate-filespec-size-only-fix'
2017-03-13 Junio C HamanoMerge branch 'vn/line-log-memcpy-size-fix'
2017-03-13 Junio C HamanoMerge branch 'jk/ewah-use-right-type-in-sizeof'
2017-03-13 Junio C HamanoMerge branch 'ax/line-log-range-merge-fix'
2017-03-13 Junio C HamanoMerge branch 'jh/mingw-openssl-sha1'
2017-03-10 Junio C HamanoMerge branch 'rs/log-email-subject'
2017-03-10 Junio C HamanoMerge branch 'tg/stash-push'
2017-03-10 Junio C HamanoMerge branch 'ew/markdown-url-in-readme'
2017-03-10 Junio C HamanoMerge branch 'jk/http-auth'
2017-03-10 Junio C HamanoMerge branch 'jh/send-email-one-cc'
2017-03-10 Junio C HamanoMerge branch 'rs/strbuf-add-real-path'
2017-03-10 Junio C HamanoMerge branch 'rs/sha1-file-plug-fallback-base-leak'
2017-03-10 Junio C HamanoMerge branch 'rs/commit-parsing-optim'
2017-03-10 Junio C HamanoMerge branch 'jk/t6300-cleanup'
2017-03-10 Junio C HamanoMerge branch 'jk/parse-config-key-cleanup'
2017-03-10 Junio C HamanoMerge branch 'sb/parse-hide-refs-config-cleanup'
2017-03-10 Junio C HamanoMerge branch 'jt/upload-pack-error-report'
2017-03-10 Junio C HamanoMerge branch 'jk/ident-empty'
2017-03-10 Junio C HamanoMerge branch 'jc/config-case-cmdline-take-2'
2017-02-27 Junio C HamanoMerge branch 'rl/remote-allow-missing-branch-name-merge'
2017-02-27 Junio C HamanoMerge branch 'jk/tempfile-ferror-fclose-confusion'
2017-02-27 Junio C HamanoMerge branch 'mm/two-more-xstrfmt'
2017-02-27 Junio C HamanoMerge branch 'nd/clean-preserve-errno-in-warning'
2017-02-27 Junio C HamanoMerge branch 'jk/show-branch-lift-name-len-limit'
2017-02-27 Junio C HamanoMerge branch 'jn/remote-helpers-with-git-dir'
2017-02-27 Junio C HamanoMerge branch 'dt/gc-ignore-old-gc-logs'
2017-02-27 Junio C HamanoMerge branch 'jh/preload-index-skip-skip'
2017-02-27 Junio C HamanoMerge branch 'mh/submodule-hash'
2017-02-27 Junio C HamanoMerge branch 'cw/tag-reflog-message'
2017-02-27 Junio C HamanoMerge branch 'kn/ref-filter-branch-list'
2017-02-27 Junio C HamanoMerge branch 'mm/merge-rename-delete-message'
next