Merge branch 'nd/qsort-in-merge-recursive' into maint
[git/git.git] / merge-recursive.c
2017-01-17 Junio C HamanoMerge branch 'nd/qsort-in-merge-recursive' into maint
2017-01-17 Junio C HamanoMerge branch 'dt/smart-http-detect-server-going-away...
2017-01-17 Junio C HamanoMerge branch 'mk/mingw-winansi-ttyname-termination...
2017-01-17 Junio C HamanoMerge branch 'gv/p4-multi-path-commit-fix' into maint
2017-01-17 Junio C HamanoMerge branch 'jk/difftool-in-subdir' into maint
2017-01-17 Junio C HamanoMerge branch 'ld/p4-compare-dir-vs-symlink' into maint
2017-01-17 Junio C HamanoMerge branch 'jc/push-default-explicit' into maint
2017-01-17 Junio C HamanoMerge branch 'jt/mailinfo-fold-in-body-headers' into...
2017-01-17 Junio C HamanoMerge branch 'jk/index-pack-wo-repo-from-stdin' into...
2017-01-17 Junio C HamanoMerge branch 'jk/parseopt-usage-msg-opt' into maint
2017-01-17 Junio C HamanoMerge branch 'jk/quote-env-path-list-component' into...
2017-01-17 Junio C HamanoMerge branch 'nd/shallow-fixup' into maint
2017-01-17 Junio C HamanoMerge branch 'sb/sequencer-abort-safety' into maint
2017-01-17 Junio C HamanoMerge branch 'da/mergetool-xxdiff-hotkey' into maint
2017-01-17 Junio C HamanoMerge branch 'jc/pull-rebase-ff' into maint
2017-01-17 Junio C HamanoMerge branch 'js/normalize-path-copy-ceil' into maint
2017-01-17 Junio C HamanoMerge branch 'ak/commit-only-allow-empty' into maint
2017-01-17 Junio C HamanoMerge branch 'da/difftool-dir-diff-fix' into maint
2017-01-17 Junio C HamanoMerge branch 'jb/diff-no-index-no-abbrev' into maint
2017-01-17 Junio C HamanoMerge branch 'jk/stash-disable-renames-internally'...
2017-01-17 Junio C HamanoMerge branch 'jk/http-walker-limit-redirect' into maint
2017-01-17 Junio C HamanoMerge branch 'jc/renormalize-merge-kill-safer-crlf...
2017-01-17 Junio C HamanoMerge branch 'ls/p4-empty-file-on-lfs' into maint
2017-01-17 Junio C HamanoMerge branch 'da/mergetool-trust-exit-code' into maint
2017-01-17 Junio C HamanoMerge branch 'nd/worktree-list-fixup' into maint
2017-01-17 Junio C HamanoMerge branch 'bw/push-dry-run' into maint
2017-01-17 Junio C HamanoMerge branch 'hv/submodule-not-yet-pushed-fix' into...
2017-01-17 Junio C HamanoMerge branch 'dt/empty-submodule-in-merge' into maint
2017-01-17 Junio C HamanoMerge branch 'jk/rev-parse-symbolic-parents-fix' into...
2017-01-17 Junio C HamanoMerge branch 'js/mingw-isatty' into maint
2017-01-17 Junio C HamanoMerge branch 'bb/unicode-9.0' into maint
2016-12-06 Junio C HamanoMerge branch 'ew/http-walker' into jk/http-walker-limit...
2016-12-05 Junio C HamanoSync with maint-2.10
2016-12-05 Junio C HamanoMerge branch 'jk/common-main' into maint-2.10
2016-12-01 Junio C HamanoMerge branch 'tb/t0027-raciness-fix' into jc/renormaliz...
2016-11-29 Junio C HamanoMerge branch 'tk/diffcore-delta-remove-unused' into...
2016-11-29 Junio C HamanoMerge branch 'jk/create-branch-remove-unused-param...
2016-11-29 Junio C HamanoMerge branch 'nd/worktree-lock' into maint
2016-11-29 Junio C HamanoMerge branch 'ps/common-info-doc' into maint
2016-11-29 Junio C HamanoMerge branch 'nd/test-helpers' into maint
2016-11-29 Junio C HamanoMerge branch 'sc/fmt-merge-msg-doc-markup-fix' into...
2016-11-29 Junio C HamanoMerge branch 'rs/commit-pptr-simplify' into maint
2016-11-29 Junio C HamanoMerge branch 'jk/rebase-config-insn-fmt-docfix' into...
2016-11-29 Junio C HamanoMerge branch 'ak/pre-receive-hook-template-modefix...
2016-11-29 Junio C HamanoMerge branch 'ls/macos-update' into maint
2016-11-29 Junio C HamanoMerge branch 'as/merge-attr-sleep' into maint
2016-11-29 Junio C HamanoMerge branch 'jk/daemon-path-ok-check-truncation' into...
2016-11-29 Junio C HamanoMerge branch 'rs/ring-buffer-wraparound' into maint
2016-11-29 Junio C HamanoMerge branch 'mm/send-email-cc-cruft-after-address...
2016-11-29 Junio C HamanoMerge branch 'cp/completion-negative-refs' into maint
2016-11-29 Junio C HamanoMerge branch 'jc/am-read-author-file' into maint
2016-11-29 Junio C HamanoMerge branch 'jk/common-main'
2016-11-28 Nguyễn Thái Ngọc Duymerge-recursive.c: use string_list_sort instead of...
2016-11-28 Johannes Schindelinmerge-recursive: handle NULL in add_cacheinfo() correctly
2016-11-23 Junio C HamanoMerge branch 'jt/trailer-with-cruft'
2016-11-23 Junio C HamanoMerge branch 'js/rebase-i-commentchar-fix'
2016-11-23 Junio C HamanoMerge branch 'jc/for-each-ref-head-segfault-fix'
2016-11-22 Junio C HamanoMerge branch 'js/prepare-sequencer'
2016-11-18 David Turnersubmodules: allow empty working-tree dirs in merge...
2016-11-17 Junio C HamanoMerge branch 'tk/diffcore-delta-remove-unused'
2016-11-17 Junio C HamanoMerge branch 'jk/create-branch-remove-unused-param'
2016-11-17 Junio C HamanoMerge branch 'nd/worktree-lock'
2016-11-11 Junio C HamanoMerge branch 'ps/common-info-doc'
2016-11-11 Junio C HamanoMerge branch 'ls/macos-update'
2016-11-11 Junio C HamanoMerge branch 'js/prepare-sequencer'
2016-11-11 Junio C HamanoMerge branch 'ls/filter-process'
2016-11-11 Junio C HamanoMerge branch 'as/merge-attr-sleep'
2016-11-10 Junio C HamanoMerge branch 'jk/alt-odb-cleanup'
2016-11-10 Junio C HamanoMerge branch 'jk/filter-process-fix'
2016-11-10 Junio C HamanoMerge branch 'ls/filter-process'
2016-11-02 Jiang XinMerge branch 'russian-l10n' of https://github.com/DJm00...
2016-11-01 Junio C HamanoMerge branch 'rs/cocci'
2016-10-31 Junio C HamanoMerge branch 'nd/test-helpers'
2016-10-31 Junio C HamanoMerge branch 'sc/fmt-merge-msg-doc-markup-fix'
2016-10-31 Junio C HamanoMerge branch 'ak/sh-setup-dot-source-i18n-fix'
2016-10-31 Junio C HamanoMerge branch 'rs/commit-pptr-simplify'
2016-10-31 Junio C HamanoMerge branch 'jk/rebase-config-insn-fmt-docfix'
2016-10-31 Junio C HamanoMerge branch 'ak/pre-receive-hook-template-modefix'
2016-10-31 Junio C HamanoMerge branch 'jk/common-main'
2016-10-31 Junio C HamanoMerge branch 'jt/trailer-with-cruft'
2016-10-31 Junio C HamanoMerge branch 'ls/filter-process'
2016-10-31 Junio C HamanoMerge branch 'ls/git-open-cloexec'
2016-10-28 Junio C HamanoSync with 2.10.2
2016-10-28 Junio C HamanoMerge branch 'pb/test-parse-options-expect' into maint
2016-10-28 Junio C HamanoMerge branch 'jc/cocci-xstrdup-or-null' into maint
2016-10-28 Junio C HamanoMerge branch 'rs/cocci' into maint
2016-10-28 Junio C HamanoMerge branch 'rs/pretty-format-color-doc-fix' into...
2016-10-28 Junio C HamanoMerge branch 'js/reset-usage' into maint
2016-10-28 Junio C HamanoMerge branch 'po/fix-doc-merge-base-illustration' into...
2016-10-28 Junio C HamanoMerge branch 'jk/tap-verbose-fix' into maint
2016-10-28 Junio C HamanoMerge branch 'tg/add-chmod+x-fix' into maint
2016-10-28 Junio C HamanoMerge branch 'bw/submodule-branch-dot-doc' into maint
2016-10-28 Junio C HamanoMerge branch 'jk/tighten-alloc' into maint
2016-10-28 Junio C HamanoMerge branch 'jk/fetch-quick-tag-following' into maint
2016-10-28 Junio C HamanoMerge branch 'jk/merge-base-fork-point-without-reflog...
2016-10-28 Junio C HamanoMerge branch 'sb/submodule-config-doc-drop-path' into...
2016-10-28 Junio C HamanoMerge branch 'nd/commit-p-doc' into maint
2016-10-28 Junio C HamanoMerge branch 'jk/clone-copy-alternates-fix' into maint
2016-10-28 Junio C HamanoMerge branch 'dp/autoconf-curl-ssl' into maint
2016-10-28 Junio C HamanoMerge branch 'ak/curl-imap-send-explicit-scheme' into...
next