rerere: mention caveat about unmatched conflict markers
[gitweb.git] / compat / mingw.h
2018-06-28 Merge branch 'pw/add-p-recount'
2018-06-28 Merge branch 'jk/fetch-all-peeled-fix'
2018-06-28 Merge branch 'ms/send-pack-honor-config'
2018-06-28 Merge branch 'jh/partial-clone'
2018-06-28 Merge branch 'as/safecrlf-quiet-fix'
2018-06-25 Merge branch 'sg/update-ref-stdin-cleanup'
2018-06-25 Merge branch 'nd/reject-empty-shallow-request'
2018-06-25 Merge branch 'ds/commit-graph-lockfile-fix'
2018-06-18 Merge branch 'es/make-no-iconv'
2018-06-18 Merge branch 'sg/t7406-chain-fix'
2018-06-18 Merge branch 'ks/branch-set-upstream'
2018-06-18 Merge branch 'jk/ewah-bounds-check'
2018-06-18 Merge branch 'sb/blame-color'
2018-06-18 Merge branch 'mw/doc-merge-enumfix'
2018-06-18 Merge branch 'en/rename-directory-detection'
2018-06-18 Merge branch 'rd/doc-remote-tracking-with-hyphen'
2018-06-18 Merge branch 'jl/zlib-restore-nul-termination'
2018-06-18 Merge branch 'km/doc-workflows-typofix'
2018-06-18 Merge branch 'rd/diff-options-typofix'
2018-06-18 Merge branch 'rd/comment-typofix-in-sha1-file'
2018-06-04 Merge branch 'nd/remote-update-doc'
2018-06-01 Merge branch 'en/rev-parse-invalid-range'
2018-06-01 Merge branch 'ld/p4-unshelve'
2018-05-30 Merge branch 'js/empty-config-section-fix'
2018-05-30 Merge branch 'sb/grep-die-on-unreadable-index'
2018-05-30 Merge branch 'sb/blame-color'
2018-05-30 Merge branch 'rs/no-null-ptr-arith-in-fast-export'
2018-05-30 Merge branch 'nd/repo-clear-keep-the-index'
2018-05-23 Merge branch 'tb/test-apfs-utf8-normalization'
2018-05-23 Merge branch 'tg/worktree-add-existing-branch'
2018-05-23 Merge branch 'ds/lazy-load-trees'
2018-05-23 Merge branch 'sg/t7005-spaces-in-filenames-cleanup'
2018-05-22 Sync with Git 2.16.4
2018-05-22 Merge branch 'jk/submodule-name-verify-fix' into jk...
2018-05-08 Merge branch 'jc/parseopt-expiry-errors'
2018-05-08 Merge branch 'ma/fast-export-skip-merge-fix'
2018-05-08 Merge branch 'nd/submodule-status-fix'
2018-05-08 Merge branch 'ab/git-svn-get-record-typofix'
2018-05-08 Merge branch 'sg/doc-gc-quote-mismatch-fix'
2018-05-08 Merge branch 'ls/checkout-encoding'
2018-05-08 Merge branch 'ab/nuke-emacs-contrib'
2018-05-08 Merge branch 'nd/warn-more-for-devs'
2018-05-08 Merge branch 'ds/commit-graph'
2018-05-08 Merge branch 'js/empty-config-section-fix'
2018-05-08 Merge branch 'sb/submodule-move-nested'
2018-05-08 Merge branch 'ab/simplify-perl-makefile'
2018-05-08 Merge branch 'bw/protocol-v2'
2018-05-02 Merge branch 'bw/protocol-v2' into jt/partial-clone...
2018-04-25 Merge branch 'bp/fsmonitor-bufsize-fix'
2018-04-25 Merge branch 'es/worktree-docs'
2018-04-25 Merge branch 'es/fread-reads-dir-autoconf-fix'
2018-04-25 Merge branch 'ps/test-chmtime-get'
2018-04-25 Merge branch 'js/t5404-path-fix'
2018-04-25 Merge branch 'en/doc-typoes'
2018-04-25 Merge branch 'lw/daemon-log-destination'
2018-04-25 Merge branch 'mn/send-email-credential-doc'
2018-04-25 Merge branch 'ak/bisect-doc-typofix'
2018-04-25 Merge branch 'nd/worktree-move'
2018-04-25 Merge branch 'jk/t5561-missing-curl'
2018-04-25 Merge branch 'bw/commit-partial-from-subdirectory-fix'
2018-04-25 Merge branch 'jk/flockfile-stdio'
2018-04-25 Merge branch 'pw/rebase-signoff'
2018-04-25 Merge branch 'pw/rebase-keep-empty-fixes'
2018-04-25 Merge branch 'cb/git-gui-ttk-style'
2018-04-25 Merge branch 'bp/git-gui-bind-kp-enter'
2018-04-25 Merge branch 'bb/git-gui-ssh-key-files'
2018-04-24 Merge branch 'bw/protocol-v2' into HEAD
2018-04-15 Merge branch 'master' of https://github.com/ralfth...
2018-04-11 Merge branch 'eb/cred-helper-ignore-sigpipe'
2018-04-11 Merge branch 'lv/tls-1.3'
2018-04-11 Merge branch 'pk/test-avoid-pipe-hiding-exit-status'
2018-04-11 Merge branch 'rs/status-with-removed-submodule'
2018-04-11 Merge branch 'sb/packfiles-in-repository'
2018-04-11 Merge branch 'sb/object-store'
2018-04-11 Merge branch 'jc/test-must-be-empty'
2018-04-10 Merge branch 'ys/bisect-object-id-missing-conversion...
2018-04-10 Merge branch 'yk/filter-branch-non-committish-refs'
2018-04-10 Merge branch 'nd/trace-with-env'
2018-04-10 Merge branch 'nd/parseopt-completion-more'
2018-04-10 Merge branch 'ds/bsearch-hash'
2018-04-10 Merge branch 'jk/diff-highlight-graph-fix'
2018-04-10 Merge branch 'nd/remove-ignore-env-field'
2018-04-10 Merge branch 'ps/contains-id-error-message'
2018-04-09 Merge branch 'tg/stash-untracked-with-pathspec-fix'
2018-04-09 Merge branch 'nd/worktree-prune'
2018-04-09 Merge branch 'bc/object-id'
2018-04-09 Merge branch 'ma/shortlog-revparse'
2018-04-09 Merge branch 'ab/install-symlinks'
2018-04-09 Merge branch 'ml/filter-branch-no-op-error'
2018-04-09 Merge branch 'ab/pcre-v2'
2018-04-09 Merge branch 'ti/fetch-everything-local-optim'
2018-04-09 Merge branch 'en/rename-directory-detection'
2018-04-02 Merge tag 'l10n-2.17.0-rnd1' of git://github.com/git...
2018-04-02 Merge branch 'pw/add-p-single'
2018-03-29 Merge branch 'jh/partial-clone'
2018-03-28 Merge branch 'tg/stash-doc-typofix'
2018-03-28 Merge branch 'pc/submodule-helper'
2018-03-28 Merge branch 'nd/parseopt-completion'
2018-03-22 Sync with Git 2.16.3
2018-03-22 Merge branch 'gs/test-unset-xdg-cache-home' into maint
next