Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
[gitweb.git] / ll-merge.c
2017-10-07 Merge branch 'tg/memfixes'
2017-10-07 Merge branch 'sb/branch-avoid-repeated-strbuf-release'
2017-10-07 Merge branch 'rs/qsort-s'
2017-10-07 Merge branch 'jn/strbuf-doc-re-reuse'
2017-10-05 Merge branch 'ar/request-pull-phrasofix'
2017-10-05 Merge branch 'rs/run-command-use-alloc-array'
2017-10-05 Merge branch 'sb/git-clang-format'
2017-10-05 Merge branch 'rs/tag-null-pointer-arith-fix'
2017-10-05 Merge branch 'rs/cocci-de-paren-call-params'
2017-10-05 Merge branch 'rs/resolve-ref-optional-result'
2017-10-05 Merge branch 'er/fast-import-dump-refs-on-checkpoint'
2017-10-04 Merge branch 'jk/ui-color-always-to-auto-maint' into...
2017-10-03 Merge branch 'bw/git-clang-format'
2017-10-03 Merge branch 'ad/doc-markup-fix'
2017-10-03 Merge branch 'mh/mmap-packed-refs'
2017-10-03 Merge branch 'mr/doc-negative-pathspec'
2017-10-03 Merge branch 'sb/diff-color-move'
2017-10-03 Merge branch 'jk/validate-headref-fix'
2017-10-03 Merge branch 'jk/no-optional-locks'
2017-10-03 Merge branch 'sd/branch-copy'
2017-10-03 Merge branch 'bc/rev-parse-parseopt-fix'
2017-10-03 Merge branch 'js/rebase-i-final'
2017-09-29 Merge branch 'sb/doc-config-submodule-update'
2017-09-29 Merge branch 'ma/leakplugs'
2017-09-29 Merge branch 'rj/no-sign-compare'
2017-09-29 Merge branch 'sb/merge-commit-msg-hook'
2017-09-29 Merge branch 'jt/fast-export-copy-modify-fix'
2017-09-29 Merge branch 'mk/describe-match-with-all'
2017-09-29 Merge branch 'jm/status-ignored-directory-optim'
2017-09-28 Merge branch 'js/win32-lazyload-dll'
2017-09-28 Merge branch 'jc/merge-x-theirs-docfix'
2017-09-28 Merge branch 'ks/doc-use-camelcase-for-config-name'
2017-09-28 Merge branch 'mk/diff-delta-avoid-large-offset'
2017-09-28 Merge branch 'mk/diff-delta-uint-may-be-shorter-than...
2017-09-28 Merge branch 'rs/resolve-ref-optional-result'
2017-09-28 Merge branch 'rs/mailinfo-qp-decode-fix'
2017-09-28 Merge branch 'jk/doc-read-tree-table-asciidoctor-fix'
2017-09-28 Merge branch 'ik/userdiff-html-h-element-fix'
2017-09-28 Merge branch 'jk/fallthrough'
2017-09-28 Merge branch 'jk/diff-blob'
2017-09-28 Merge branch 'hn/typofix'
2017-09-28 Merge branch 'ic/fix-filter-branch-to-handle-tag-withou...
2017-09-28 Merge branch 'jk/describe-omit-some-refs'
2017-09-26 Sync with 2.14.2
2017-09-25 Merge branch 'ks/test-readme-phrasofix'
2017-09-25 Merge branch 'ow/rev-parse-is-shallow-repo'
2017-09-25 Merge branch 'rj/test-ulimit-on-windows'
2017-09-25 Merge branch 'jk/info-alternates-fix'
2017-09-25 Merge branch 'mh/for-each-string-list-item-empty-fix'
2017-09-25 Merge branch 'tb/test-lint-echo-e'
2017-09-25 Merge branch 'jk/revision-remove-cmdline-pathspec'
2017-09-25 Merge branch 'ls/travis-scriptify'
2017-09-25 Merge branch 'aw/gc-lockfile-fscanf-fix'
2017-09-25 Merge branch 'hv/mv-nested-submodules-test'
2017-09-25 Merge branch 'bw/git-clang-format'
2017-09-25 Merge branch 'nm/imap-send-with-curl'
2017-09-25 Merge branch 'ks/commit-do-not-touch-cut-line'
2017-09-25 Merge branch 'tg/refs-allowed-flags'
2017-09-25 Merge branch 'rs/archive-excluded-directory'
2017-09-25 Merge branch 'ks/help-alias-label'
2017-09-25 Merge branch 'jn/per-repo-object-store-fixes'
2017-09-25 Merge branch 'jk/write-in-full-fix'
2017-09-22 Sync with 2.13.6
2017-09-22 Sync with 2.12.5
2017-09-20 Merge branch 'jk/describe-omit-some-refs' into mk/descr...
2017-09-20 Merge branch 'jk/info-alternates-fix-2.11' into jk...
2017-09-19 Merge branch 'mh/packed-ref-store-prep'
2017-09-19 Merge branch 'jk/system-path-cleanup'
2017-09-19 Merge branch 'mg/timestamp-t-fix'
2017-09-19 Merge branch 'ma/pkt-line-leakfix'
2017-09-19 Merge branch 'jk/config-lockfile-leak-fix'
2017-09-14 avoid "write_in_full(fd, buf, len) != len" pattern
2017-09-10 Merge branch 'jk/drop-sha1-entry-pos'
2017-09-10 Merge branch 'nd/worktree-kill-parse-ref'
2017-09-10 Merge branch 'jt/doc-pack-objects-fix' into maint
2017-09-10 Merge branch 'jn/vcs-svn-cleanup' into maint
2017-09-10 Merge branch 'bc/vcs-svn-cleanup' into maint
2017-09-10 Merge branch 'jk/doc-the-this' into maint
2017-09-10 Merge branch 'sb/submodule-parallel-update' into maint
2017-09-10 Merge branch 'hv/t5526-andand-chain-fix' into maint
2017-09-10 Merge branch 'sb/sha1-file-cleanup' into maint
2017-09-10 Merge branch 'rs/t1002-do-not-use-sum' into maint
2017-09-10 Merge branch 'ah/doc-empty-string-is-false' into maint
2017-09-10 Merge branch 'rs/merge-microcleanup' into maint
2017-09-10 Merge branch 'rs/find-pack-entry-bisection' into maint
2017-09-10 Merge branch 'rs/apply-lose-prefix-length' into maint
2017-09-10 Merge branch 'rj/add-chmod-error-message' into maint
2017-09-10 Merge branch 'jk/hashcmp-memcmp' into maint
2017-09-10 Merge branch 'rs/t3700-clean-leftover' into maint
2017-09-10 Merge branch 'jc/perl-git-comment-typofix' into maint
2017-09-10 Merge branch 'ab/ref-filter-no-contains' into maint
2017-09-10 Merge branch 'as/grep-quiet-no-match-exit-code-fix...
2017-09-10 Merge branch 'rs/win32-syslog-leakfix' into maint
2017-09-10 Merge branch 'rs/unpack-entry-leakfix' into maint
2017-09-10 Merge branch 'rs/fsck-obj-leakfix' into maint
2017-09-10 Merge branch 'ur/svn-local-zone' into maint
2017-09-10 Merge branch 'pw/am-signoff' into maint
2017-09-10 Merge branch 'rs/in-obsd-basename-dirname-take-const...
2017-09-10 Merge branch 'rs/t4062-obsd' into maint
2017-09-10 Merge branch 'rs/obsd-getcwd-workaround' into maint
next