cherry-pick/revert: add scissors line on merge conflict
[git/git.git] / sequencer.c
2019-04-19 Denton Liucherry-pick/revert: add scissors line on merge conflict
2019-04-19 Phillip Woodsequencer.c: save and restore cleanup mode
2019-04-18 Denton Liucommit: extract cleanup_mode functions to sequencer
2019-04-18 Phillip Woodsequencer: fix cleanup with --signoff and -x
2019-04-16 Junio C HamanoMerge branch 'sg/t5318-cleanup'
2019-04-16 Junio C HamanoMerge branch 'jt/t5551-protocol-v2-does-not-have-half...
2019-04-16 Junio C HamanoMerge branch 'jk/http-walker-status-fix'
2019-04-16 Junio C HamanoMerge branch 'jh/midx-verify-too-many-packs'
2019-04-16 Junio C HamanoMerge branch 'bb/unicode-12'
2019-04-16 Junio C HamanoMerge branch 'jk/refs-double-abort'
2019-04-16 Junio C HamanoMerge branch 'nd/checkout-m-doc-update'
2019-04-16 Junio C HamanoMerge branch 'tb/trace2-va-list-fix'
2019-04-16 Junio C HamanoMerge branch 'tz/completion'
2019-04-16 Junio C HamanoMerge branch 'ma/doc-diff-doc-vs-doctor-comparison'
2019-04-16 Junio C HamanoMerge branch 'tz/t4038-bash-redirect-target-workaround'
2019-04-16 Junio C HamanoMerge branch 'ab/drop-scripted-rebase'
2019-04-16 Junio C HamanoMerge branch 'jk/perf-lib-tee'
2019-04-16 Junio C HamanoMerge branch 'ab/doc-misc-typofixes'
2019-04-16 Junio C HamanoMerge branch 'mh/pack-protocol-doc-fix'
2019-04-16 Junio C HamanoMerge branch 'tg/glossary-overlay'
2019-04-16 Junio C HamanoMerge branch 'nd/checkout-f-while-conflicted-fix'
2019-04-16 Junio C HamanoMerge branch 'pw/rerere-autoupdate'
2019-04-16 Junio C HamanoMerge branch 'jc/format-patch-error-check'
2019-04-16 Junio C HamanoMerge branch 'js/get-short-oid-drop-cache'
2019-04-16 Junio C HamanoMerge branch 'js/remote-curl-i18n'
2019-04-16 Junio C HamanoMerge branch 'js/anonymize-remote-curl-diag'
2019-04-16 Junio C HamanoMerge branch 'ma/asciidoctor-fixes-more'
2019-04-16 Junio C HamanoMerge branch 'ma/asciidoctor-fixes'
2019-04-16 Junio C HamanoMerge branch 'jt/test-protocol-version'
2019-04-16 Junio C HamanoMerge branch 'nd/diff-parseopt-3'
2019-04-09 Junio C HamanoMerge branch 'jt/submodule-fetch-errmsg'
2019-04-09 Junio C HamanoMerge branch 'jk/sha1dc'
2019-04-09 Junio C HamanoMerge branch 'jk/promote-ggg'
2019-04-09 Junio C HamanoMerge branch 'ar/t4150-remove-cruft'
2019-04-09 Junio C HamanoMerge branch 'ms/worktree-add-atomic-mkdir'
2019-04-09 Junio C HamanoMerge branch 'jk/line-log-with-patch'
2019-04-09 Junio C HamanoMerge branch 'ra/t3600-test-path-funcs'
2019-04-09 Junio C HamanoMerge branch 'nd/rewritten-ref-is-per-worktree'
2019-04-09 Junio C HamanoMerge branch 'jh/resize-convert-scratch-buffer'
2019-04-09 Junio C HamanoMerge branch 'dl/ignore-docs'
2019-04-09 Junio C HamanoMerge branch 'ja/dir-rename-doc-markup-fix'
2019-04-09 Junio C HamanoMerge branch 'dl/reset-doc-no-wrt-abbrev'
2019-03-20 Junio C HamanoMerge branch 'br/commit-tree-parseopt'
2019-03-20 Junio C HamanoMerge branch 'jk/config-type-color-ends-with-lf'
2019-03-20 Junio C HamanoMerge branch 'ma/clear-repository-format'
2019-03-20 Junio C HamanoMerge branch 'jk/virtual-objects-do-exist'
2019-03-20 Junio C HamanoMerge branch 'jk/no-sigpipe-during-network-transport'
2019-03-20 Junio C HamanoMerge branch 'jk/fsck-doc'
2019-03-20 Junio C HamanoMerge branch 'js/stress-test-ui-tweak'
2019-03-20 Junio C HamanoMerge branch 'js/rebase-orig-head-fix'
2019-03-20 Junio C HamanoMerge branch 'jk/bisect-final-output'
2019-03-20 Junio C HamanoMerge branch 'ab/makefile-help-devs-more'
2019-03-18 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2019-03-14 Johannes Schindelinsequencer: move stale comment into correct location
2019-03-14 Johannes Schindelinsequencer: improve error message when an OID could...
2019-03-11 Junio C HamanoSync with maint
2019-03-11 Junio C HamanoMerge branch 'js/rebase-recreate-merge'
2019-03-11 Junio C HamanoMerge branch 'js/untravis-windows'
2019-03-11 Junio C HamanoMerge branch 'rd/gc-prune-doc-fix'
2019-03-11 Junio C HamanoMerge branch 'js/find-lib-h-with-ls-files-when-possible'
2019-03-11 Junio C HamanoMerge branch 'rj/hdr-check-gcrypt-fix'
2019-03-11 Junio C HamanoMerge branch 'jk/guard-bswap-header'
2019-03-11 Junio C HamanoMerge branch 'rd/attr.c-comment-typofix'
2019-03-11 Junio C HamanoMerge branch 'yb/utf-16le-bom-spellfix'
2019-03-07 Junio C HamanoMerge branch 'jt/http-auth-proto-v2-fix'
2019-03-07 Junio C HamanoMerge branch 'jk/diff-no-index-initialize'
2019-03-07 Junio C HamanoMerge branch 'nd/no-more-check-racy'
2019-03-07 Junio C HamanoMerge branch 'rd/doc-hook-used-in-sample'
2019-03-07 Junio C HamanoMerge branch 'nd/diff-parseopt-2'
2019-03-07 Junio C HamanoMerge branch 'en/merge-options-doc'
2019-03-07 Junio C HamanoMerge branch 'nd/completion-more-parameters'
2019-03-07 Junio C HamanoMerge branch 'ab/receive-pack-use-after-free-fix'
2019-03-07 Junio C HamanoMerge branch 'dl/doc-submodule-wo-subcommand'
2019-03-07 Junio C HamanoMerge branch 'jk/unused-params'
2019-03-07 Junio C HamanoMerge branch 'jh/trace2'
2019-03-07 Junio C HamanoMerge branch 'jk/prune-optim'
2019-03-07 Junio C HamanoMerge branch 'js/doc-symref-in-proto-v1'
2019-03-07 Junio C HamanoMerge branch 'nd/split-index-null-base-fix'
2019-03-07 Junio C HamanoMerge branch 'rj/prune-packed-excess-args'
2019-03-07 Junio C HamanoMerge branch 'jc/test-yes-doc'
2019-03-07 Junio C HamanoMerge branch 'en/combined-all-paths'
2019-03-07 Junio C HamanoMerge branch 'sc/pack-redundant'
2019-03-07 Junio C HamanoMerge branch 'du/branch-show-current'
2019-03-07 Junio C HamanoMerge branch 'dl/complete-submodule-absorbgitdirs'
2019-03-07 Junio C HamanoMerge branch 'wh/author-committer-ident-config'
2019-03-07 Junio C HamanoMerge branch 'aw/pretty-trailers'
2019-03-07 Junio C HamanoMerge branch 'nd/diff-parseopt'
2019-03-07 Junio C HamanoMerge branch 'tg/checkout-no-overlay'
2019-02-24 Junio C HamanoMerge branch 'yn/checkout-doc-fix'
2019-02-23 Junio C HamanoMerge branch 'ab/workaround-dash-bug-in-test'
2019-02-22 Jeff Hostetlertrace2:data: add trace2 hook classification
2019-02-15 Jiang XinMerge branch 'master' of git://git./git/git
2019-02-14 Junio C HamanoMerge branch 'ea/rebase-compat-doc-fix'
2019-02-14 Junio C HamanoMerge branch 'jc/no-grepping-for-strerror-in-tests'
2019-02-14 Junio C HamanoMerge branch 'jt/fetch-v2-sideband'
2019-02-14 Junio C HamanoMerge branch 'en/rebase-merge-on-sequencer'
2019-02-14 Junio C HamanoMerge branch 'ab/rebase-test-fix'
2019-02-14 Junio C HamanoMerge branch 'rb/no-dev-zero-in-test'
2019-02-14 Junio C HamanoMerge branch 'rs/bash-is-in-coreutils-on-nonstop'
2019-02-14 Junio C HamanoMerge branch 'js/mingw-host-cpu'
next