pull: avoid running both merge and rebase
[git] / column.c
2019-12-06  Johannes SchindelinSync with 2.23.1
2019-12-06  Johannes SchindelinSync with 2.20.2
2019-12-06  Johannes SchindelinSync with 2.17.3
2019-12-06  Johannes SchindelinSync with 2.14.6
2019-11-04  Junio C HamanoMerge branch 'bc/doc-use-docbook-5'
2019-11-04  Junio C HamanoMerge branch 'ds/commit-graph-on-fetch'
2019-11-04  Junio C HamanoMerge https://github.com/prati0100/git-gui
2019-10-30  Junio C HamanoMerge branch 'wb/fsmonitor-bitmap-fix'
2019-10-30  Junio C HamanoMerge branch 'rl/gitweb-blame-prev-fix'
2019-10-30  Junio C HamanoMerge branch 'js/mingw-needs-hiding-fix'
2019-10-24  Junio C HamanoMerge branch 'sg/ci-osx-gcc8-fix'
2019-10-24  Junio C HamanoMerge branch 'ds/feature-macros'
2019-10-24  Junio C HamanoMerge branch 'js/azure-ci-osx-fix'
2019-10-24  Junio C HamanoMerge branch 'bw/format-patch-o-create-leading-dirs'
2019-10-24  Junio C HamanoMerge branch 'dl/submodule-set-branch'
2019-10-23  Junio C HamanoMerge branch 'cb/pcre2-chartables-leakfix'
2019-10-23  Junio C HamanoMerge branch 'bc/smart-http-atomic-push'
2019-10-23  Junio C HamanoMerge branch 'wb/fsmonitor-bitmap-fix'
2019-10-23  Junio C HamanoMerge branch 'sb/userdiff-dts'
2019-10-23  Junio C HamanoMerge branch 'sg/progress-fix'
2019-10-23  Junio C HamanoMerge branch 'nr/diff-highlight-indent-fix'
2019-10-23  Junio C HamanoMerge branch 'mb/clarify-zsh-completion-doc'
2019-10-23  Junio C HamanoMerge branch 'js/azure-pipelines-msvc'
2019-10-22  Jiang XinMerge branch 'master' of github.com:alshopov/git-po...
2019-10-21  Jiang XinMerge remote-tracking branch 'git-po/master' into git...
2019-10-18  Junio C HamanoMerge branch 'rs/remote-curl-use-argv-array'
2019-10-18  Junio C HamanoMerge branch 'rs/column-use-utf8-strnwidth'
2019-10-15  RenĂ© Scharfecolumn: use utf8_strnwidth() to strip out ANSI color...
2019-10-09  Junio C HamanoMerge branch 'as/shallow-slab-use-fix'
2019-10-07  Junio C HamanoMerge branch 'jk/list-objects-optim-wo-trees'
2019-09-30  Junio C HamanoMerge branch 'tg/push-all-in-mirror-forbidden'
2019-09-18  Junio C HamanoMerge branch 'master' of https://github.com/prati0100...
2019-09-17  Junio C HamanoMerge gitk to pick up emergency build fix
2019-09-16  Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2019-09-09  Junio C HamanoMerge branch 'mp/for-each-ref-missing-name-or-email'
2019-09-09  Junio C HamanoMerge branch 'nd/diff-parseopt'
2019-08-09  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index...
2019-08-07  Junio C HamanoMerge branch 'py/call-do-quit-before-exit' of github...
2019-07-29  Junio C HamanoMerge branch 'jk/xdiff-clamp-funcname-context-index'
2019-07-29  Junio C HamanoMerge branch 'bb/grep-pcre2-bug-message-fix'
2019-07-29  Junio C HamanoMerge branch 'fc/fetch-with-import-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'pw/add-p-recount' into maint
2019-07-29  Junio C HamanoMerge branch 'jk/trailers-use-config' into maint
2019-07-29  Junio C HamanoMerge branch 'ms/submodule-foreach-fix' into maint
2019-07-29  Junio C HamanoMerge branch 'js/rebase-reschedule-applies-only-to...
2019-07-29  Junio C HamanoMerge branch 'jc/denoise-rm-to-resolve' into maint
2019-07-29  Junio C HamanoMerge branch 'sr/gpg-interface-stop-at-the-end' into...
2019-07-29  Junio C HamanoMerge branch 'js/t3404-typofix' into maint
2019-07-29  Junio C HamanoMerge branch 'rm/gpg-program-doc-fix' into maint
2019-07-25  Junio C HamanoMerge branch 'md/list-objects-filter-memfix' into maint
2019-07-25  Junio C HamanoMerge branch 'jc/denoise-rm-to-resolve'
2019-07-25  Junio C HamanoMerge branch 'sr/gpg-interface-stop-at-the-end'
2019-07-25  Junio C HamanoMerge branch 'rm/gpg-program-doc-fix'
2019-07-19  Junio C HamanoMerge branch 'br/blame-ignore'
2019-07-11  Junio C HamanoMerge branch 'js/rebase-reschedule-applies-only-to...
2019-07-09  Junio C HamanoMerge branch 'ms/submodule-foreach-fix'
2019-07-09  Junio C HamanoMerge branch 'jk/trailers-use-config'
2019-07-09  Junio C HamanoMerge branch 'js/t3404-typofix'
2019-07-09  Junio C HamanoMerge branch 'pw/add-p-recount'
2019-07-09  Junio C HamanoMerge branch 'fc/fetch-with-import-fix'
2019-06-21  Junio C HamanoMerge branch 'md/list-objects-filter-parse-msgfix'
2019-06-21  Junio C HamanoMerge branch 'md/list-objects-filter-memfix'
2019-06-13  Junio C HamanoMerge branch 'ab/send-email-transferencoding-fix'
2019-05-30  Junio C HamanoMerge branch 'js/rebase-config-bitfix'
2019-05-30  Junio C HamanoMerge branch 'nd/diff-parseopt'
2019-05-19  Junio C HamanoMerge branch 'en/unicode-in-refnames'
2019-05-19  Junio C HamanoMerge branch 'dl/difftool-mergetool'
2019-05-13  Junio C HamanoMerge branch 'dl/rev-tilde-doc-clarify'
2019-05-08  Junio C HamanoMerge branch 'ss/msvc-path-utils-fix'
2019-04-25  Junio C HamanoMerge branch 'jc/gettext-test-fix'
2019-04-25  Junio C HamanoMerge branch 'jk/xmalloc'
2019-04-25  Junio C HamanoMerge branch 'nd/diff-parseopt-4'
2019-04-25  Junio C HamanoMerge branch 'ag/sequencer-reduce-rewriting-todo'
2019-04-22  Junio C HamanoMerge branch 'tg/stash-in-c-show-default-to-p-fix'
2019-04-22  Junio C HamanoMerge branch 'js/stash-in-c-pathspec-fix'
2019-04-22  Junio C HamanoMerge branch 'tb/stash-in-c-unused-param-fix'
2019-04-22  Junio C HamanoMerge branch 'ps/stash-in-c'
2019-04-19  Junio C HamanoMerge branch 'ag/sequencer-reduce-rewriting-todo' into...
2019-04-16  Junio C HamanoMerge branch 'bb/unicode-12'
2019-04-16  Junio C HamanoMerge branch 'tg/glossary-overlay'
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'
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 '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 'ja/dir-rename-doc-markup-fix'
2019-04-09  Junio C HamanoMerge branch 'dl/reset-doc-no-wrt-abbrev'
2019-04-01  Junio C HamanoMerge branch 'jt/test-protocol-version' into jt/fetch...
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/rebase-orig-head-fix'
2019-03-18  Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2019-03-11  Junio C HamanoMerge branch 'js/rebase-recreate-merge'
2019-03-11  Junio C HamanoMerge branch 'rd/gc-prune-doc-fix'
2019-03-11  Junio C HamanoMerge branch 'rj/hdr-check-gcrypt-fix'
next