Merge branch 'en/merge-directory-renames-fix'
[gitweb.git] / merge-recursive.c
2019-04-22 Merge branch 'nd/interpret-trailers-docfix'
2019-04-22 Merge branch 'js/check-docs-exe'
2019-04-22 Merge branch 'nd/include-if-wildmatch'
2019-04-22 Merge branch 'cb/doco-mono'
2019-04-22 Merge branch 'tg/stash-in-c-show-default-to-p-fix'
2019-04-22 Merge branch 'js/stash-in-c-pathspec-fix'
2019-04-22 Merge branch 'tb/stash-in-c-unused-param-fix'
2019-04-22 Merge branch 'ps/stash-in-c'
2019-04-19 Merge branch 'ag/sequencer-reduce-rewriting-todo' into...
2019-04-16 Merge branch 'sg/t5318-cleanup'
2019-04-16 Merge branch 'jt/t5551-protocol-v2-does-not-have-half...
2019-04-16 Merge branch 'bb/unicode-12'
2019-04-16 Merge branch 'jk/refs-double-abort'
2019-04-16 Merge branch 'nd/checkout-m-doc-update'
2019-04-16 Merge branch 'tb/trace2-va-list-fix'
2019-04-16 Merge branch 'ab/doc-misc-typofixes'
2019-04-16 Merge branch 'mh/pack-protocol-doc-fix'
2019-04-16 Merge branch 'tg/glossary-overlay'
2019-04-16 Merge branch 'jc/format-patch-error-check'
2019-04-16 Merge branch 'js/remote-curl-i18n'
2019-04-16 Merge branch 'js/anonymize-remote-curl-diag'
2019-04-16 Merge branch 'ma/asciidoctor-fixes-more'
2019-04-16 Merge branch 'ma/asciidoctor-fixes'
2019-04-16 Merge branch 'jt/test-protocol-version'
2019-04-16 Merge branch 'nd/diff-parseopt-3'
2019-04-16 commit.cocci: refactor code, avoid double rewrite
2019-04-09 Merge branch 'jt/submodule-fetch-errmsg'
2019-04-09 Merge branch 'jk/sha1dc'
2019-04-09 Merge branch 'jk/promote-ggg'
2019-04-09 Merge branch 'ar/t4150-remove-cruft'
2019-04-09 Merge branch 'ms/worktree-add-atomic-mkdir'
2019-04-09 Merge branch 'jk/line-log-with-patch'
2019-04-09 Merge branch 'ra/t3600-test-path-funcs'
2019-04-09 Merge branch 'nd/rewritten-ref-is-per-worktree'
2019-04-09 Merge branch 'jh/resize-convert-scratch-buffer'
2019-04-09 Merge branch 'dl/ignore-docs'
2019-04-09 Merge branch 'ja/dir-rename-doc-markup-fix'
2019-04-09 Merge branch 'dl/reset-doc-no-wrt-abbrev'
2019-04-08 merge-recursive: switch directory rename detection...
2019-04-08 merge-recursive: give callers of handle_content_merge...
2019-04-08 merge-recursive: track information associated with...
2019-04-08 merge-recursive: switch from (oid,mode) pairs to a...
2019-04-08 merge-recursive: cleanup handle_rename_* function signa...
2019-04-08 merge-recursive: track branch where rename occurred...
2019-04-08 merge-recursive: remove ren[12]_other fields from renam...
2019-04-08 merge-recursive: shrink rename_conflict_info
2019-04-08 merge-recursive: move some struct declarations together
2019-04-08 merge-recursive: use 'ci' for rename_conflict_info...
2019-04-08 merge-recursive: rename locals 'o' and 'a' to 'obuf...
2019-04-08 merge-recursive: rename diff_filespec 'one' to 'o'
2019-04-08 merge-recursive: rename merge_options argument from...
2019-04-08 Use 'unsigned short' for mode, like diff_filespec does
2019-04-01 Merge branch 'jt/test-protocol-version' into jt/fetch...
2019-04-01 submodule: avoid hard-coded constants
2019-03-20 Merge branch 'br/commit-tree-parseopt'
2019-03-20 Merge branch 'jk/config-type-color-ends-with-lf'
2019-03-20 Merge branch 'ma/clear-repository-format'
2019-03-20 Merge branch 'jk/virtual-objects-do-exist'
2019-03-20 Merge branch 'jk/no-sigpipe-during-network-transport'
2019-03-20 Merge branch 'jk/fsck-doc'
2019-03-20 Merge branch 'js/stress-test-ui-tweak'
2019-03-20 Merge branch 'js/rebase-orig-head-fix'
2019-03-20 Merge branch 'jk/bisect-final-output'
2019-03-20 Merge branch 'ab/makefile-help-devs-more'
2019-03-18 Merge git://ozlabs.org/~paulus/gitk
2019-03-11 Sync with maint
2019-03-11 Merge branch 'js/rebase-recreate-merge'
2019-03-11 Merge branch 'js/untravis-windows'
2019-03-11 Merge branch 'rd/gc-prune-doc-fix'
2019-03-11 Merge branch 'js/find-lib-h-with-ls-files-when-possible'
2019-03-11 Merge branch 'rj/hdr-check-gcrypt-fix'
2019-03-11 Merge branch 'jk/guard-bswap-header'
2019-03-11 Merge branch 'rd/attr.c-comment-typofix'
2019-03-11 Merge branch 'yb/utf-16le-bom-spellfix'
2019-03-07 Merge branch 'jt/http-auth-proto-v2-fix'
2019-03-07 Merge branch 'jk/diff-no-index-initialize'
2019-03-07 Merge branch 'nd/no-more-check-racy'
2019-03-07 Merge branch 'rd/doc-hook-used-in-sample'
2019-03-07 Merge branch 'nd/diff-parseopt-2'
2019-03-07 Merge branch 'en/merge-options-doc'
2019-03-07 Merge branch 'nd/completion-more-parameters'
2019-03-07 Merge branch 'ab/receive-pack-use-after-free-fix'
2019-03-07 Merge branch 'dl/doc-submodule-wo-subcommand'
2019-03-07 Merge branch 'jk/unused-params'
2019-03-07 Merge branch 'js/doc-symref-in-proto-v1'
2019-03-07 Merge branch 'nd/split-index-null-base-fix'
2019-03-07 Merge branch 'rj/prune-packed-excess-args'
2019-03-07 Merge branch 'en/combined-all-paths'
2019-03-07 Merge branch 'sc/pack-redundant'
2019-03-07 Merge branch 'du/branch-show-current'
2019-03-07 Merge branch 'dl/complete-submodule-absorbgitdirs'
2019-03-07 Merge branch 'wh/author-committer-ident-config'
2019-03-07 Merge branch 'aw/pretty-trailers'
2019-03-07 Merge branch 'nd/diff-parseopt'
2019-03-07 Merge branch 'tg/checkout-no-overlay'
2019-02-24 Merge branch 'yn/checkout-doc-fix'
2019-02-23 Merge branch 'ab/workaround-dash-bug-in-test'
2019-02-20 completion: add more parameter value completion
2019-02-14 merge-recursive: drop several unused parameters
2019-02-14 Merge branch 'ea/rebase-compat-doc-fix'
next