Merge branch 'jk/stash-disable-renames-internally'
[gitweb.git] / merge-recursive.c
2016-12-19 Merge branch 'jk/stash-disable-renames-internally'
2016-12-19 Merge branch 'jk/http-walker-limit-redirect'
2016-12-19 Merge branch 'jk/http-walker-limit-redirect-2.9'
2016-12-19 Merge branch 'nd/for-each-ref-ignore-case'
2016-12-19 Merge branch 'sb/unpack-trees-grammofix'
2016-12-19 Merge branch 'ls/travis-update-p4-and-lfs'
2016-12-19 Merge branch 'ls/t0021-fixup'
2016-12-19 Merge branch 'ah/grammos'
2016-12-19 Merge branch 'jc/renormalize-merge-kill-safer-crlf'
2016-12-19 Merge branch 'jt/use-trailer-api-in-commands'
2016-12-16 Merge branch 'ls/p4-retry-thrice'
2016-12-16 Merge branch 'ls/p4-empty-file-on-lfs'
2016-12-16 Merge branch 'ld/p4-update-shelve'
2016-12-16 Merge branch 'vk/p4-submit-shelve'
2016-12-16 Merge branch 'da/mergetool-trust-exit-code'
2016-12-16 Merge branch 'ak/lazy-prereq-mktemp'
2016-12-16 Merge branch 'nd/worktree-list-fixup'
2016-12-16 Merge branch 'nd/qsort-in-merge-recursive'
2016-12-16 Merge branch 'bw/push-dry-run'
2016-12-16 Merge branch 'hv/submodule-not-yet-pushed-fix'
2016-12-16 Merge branch 'dt/empty-submodule-in-merge'
2016-12-16 Merge branch 'jk/rev-parse-symbolic-parents-fix'
2016-12-13 Merge branch 'js/mingw-isatty'
2016-12-06 Merge branch 'ew/http-walker' into jk/http-walker-limit...
2016-12-05 Sync with maint-2.10
2016-12-05 Merge branch 'jk/common-main' into maint-2.10
2016-12-01 Merge branch 'tb/t0027-raciness-fix' into jc/renormaliz...
2016-11-29 Merge branch 'tk/diffcore-delta-remove-unused' into...
2016-11-29 Merge branch 'jk/create-branch-remove-unused-param...
2016-11-29 Merge branch 'nd/worktree-lock' into maint
2016-11-29 Merge branch 'ps/common-info-doc' into maint
2016-11-29 Merge branch 'nd/test-helpers' into maint
2016-11-29 Merge branch 'sc/fmt-merge-msg-doc-markup-fix' into...
2016-11-29 Merge branch 'rs/commit-pptr-simplify' into maint
2016-11-29 Merge branch 'jk/rebase-config-insn-fmt-docfix' into...
2016-11-29 Merge branch 'ak/pre-receive-hook-template-modefix...
2016-11-29 Merge branch 'ls/macos-update' into maint
2016-11-29 Merge branch 'as/merge-attr-sleep' into maint
2016-11-29 Merge branch 'jk/daemon-path-ok-check-truncation' into...
2016-11-29 Merge branch 'rs/ring-buffer-wraparound' into maint
2016-11-29 Merge branch 'mm/send-email-cc-cruft-after-address...
2016-11-29 Merge branch 'cp/completion-negative-refs' into maint
2016-11-29 Merge branch 'jc/am-read-author-file' into maint
2016-11-29 Merge branch 'jk/common-main'
2016-11-28 merge-recursive.c: use string_list_sort instead of...
2016-11-28 merge-recursive: handle NULL in add_cacheinfo() correctly
2016-11-23 Merge branch 'jt/trailer-with-cruft'
2016-11-23 Merge branch 'js/rebase-i-commentchar-fix'
2016-11-23 Merge branch 'jc/for-each-ref-head-segfault-fix'
2016-11-22 Merge branch 'js/prepare-sequencer'
2016-11-18 submodules: allow empty working-tree dirs in merge...
2016-11-17 Merge branch 'tk/diffcore-delta-remove-unused'
2016-11-17 Merge branch 'jk/create-branch-remove-unused-param'
2016-11-17 Merge branch 'nd/worktree-lock'
2016-11-11 Merge branch 'ps/common-info-doc'
2016-11-11 Merge branch 'ls/filter-process'
2016-11-11 Merge branch 'as/merge-attr-sleep'
2016-11-11 Merge branch 'ls/macos-update'
2016-11-11 Merge branch 'js/prepare-sequencer'
2016-11-10 Merge branch 'jk/alt-odb-cleanup'
2016-11-10 Merge branch 'jk/filter-process-fix'
2016-11-10 Merge branch 'ls/filter-process'
2016-11-02 Merge branch 'russian-l10n' of https://github.com/DJm00...
2016-11-01 Merge branch 'rs/cocci'
2016-10-31 Merge branch 'nd/test-helpers'
2016-10-31 Merge branch 'sc/fmt-merge-msg-doc-markup-fix'
2016-10-31 Merge branch 'ak/sh-setup-dot-source-i18n-fix'
2016-10-31 Merge branch 'rs/commit-pptr-simplify'
2016-10-31 Merge branch 'jk/rebase-config-insn-fmt-docfix'
2016-10-31 Merge branch 'ak/pre-receive-hook-template-modefix'
2016-10-31 Merge branch 'jk/common-main'
2016-10-31 Merge branch 'jt/trailer-with-cruft'
2016-10-31 Merge branch 'ls/filter-process'
2016-10-31 Merge branch 'ls/git-open-cloexec'
2016-10-28 Sync with 2.10.2
2016-10-28 Merge branch 'pb/test-parse-options-expect' into maint
2016-10-28 Merge branch 'jc/cocci-xstrdup-or-null' into maint
2016-10-28 Merge branch 'rs/cocci' into maint
2016-10-28 Merge branch 'rs/pretty-format-color-doc-fix' into...
2016-10-28 Merge branch 'js/reset-usage' into maint
2016-10-28 Merge branch 'po/fix-doc-merge-base-illustration' into...
2016-10-28 Merge branch 'jk/tap-verbose-fix' into maint
2016-10-28 Merge branch 'tg/add-chmod+x-fix' into maint
2016-10-28 Merge branch 'bw/submodule-branch-dot-doc' into maint
2016-10-28 Merge branch 'jk/tighten-alloc' into maint
2016-10-28 Merge branch 'jk/fetch-quick-tag-following' into maint
2016-10-28 Merge branch 'jk/merge-base-fork-point-without-reflog...
2016-10-28 Merge branch 'sb/submodule-config-doc-drop-path' into...
2016-10-28 Merge branch 'nd/commit-p-doc' into maint
2016-10-28 Merge branch 'jk/clone-copy-alternates-fix' into maint
2016-10-28 Merge branch 'dp/autoconf-curl-ssl' into maint
2016-10-28 Merge branch 'ak/curl-imap-send-explicit-scheme' into...
2016-10-28 Merge branch 'js/regexec-buf' into maint
2016-10-28 Merge branch 'rs/c-auto-resets-attributes' into maint
2016-10-28 Merge branch 'yk/git-tag-remove-mention-of-old-layout...
2016-10-27 Merge branch 'svn-wt' of git://bogomips.org/git-svn
2016-10-27 Merge branch 'nd/ita-empty-commit'
2016-10-27 Merge branch 'js/prepare-sequencer'
2016-10-27 Merge branch 'jk/daemon-path-ok-check-truncation'
2016-10-27 Merge branch 'rs/ring-buffer-wraparound'
next