Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty...
[git/git.git] / merge-recursive.c
2018-01-09 Junio C HamanoMerge branch 'ew/empty-merge-with-dirty-index-maint...
2018-01-09 Junio C Hamanomerge-recursive: do not look at the index during recurs...
2017-12-22 Junio C HamanoMerge branch 'ew/empty-merge-with-dirty-index-maint...
2017-12-22 Elijah Newrenmerge-recursive: avoid incorporating uncommitted change...
2017-12-19 Junio C HamanoMerge branch 'ls/editor-waiting-message'
2017-12-19 Junio C HamanoMerge branch 'sg/setup-doc-update'
2017-12-19 Junio C HamanoMerge branch 'ar/unconfuse-three-dots'
2017-12-19 Junio C HamanoMerge branch 'tg/worktree-create-tracking'
2017-12-19 Junio C HamanoMerge branch 'gk/tracing-optimization'
2017-12-19 Junio C HamanoMerge branch 'bw/submodule-config-cleanup'
2017-12-19 Junio C HamanoMerge branch 'sb/clone-recursive-submodule-doc'
2017-12-19 Junio C HamanoMerge branch 'ls/git-gui-no-double-utf8-author-name'
2017-12-19 Junio C HamanoMerge branch 'bw/pathspec-match-submodule-boundary'
2017-12-19 Junio C HamanoMerge branch 'jt/diff-anchored-patience'
2017-12-19 Junio C HamanoMerge branch 'en/merge-recursive-icase-removal'
2017-12-19 Junio C HamanoMerge branch 'en/rename-progress'
2017-12-13 Junio C HamanoMerge branch 'js/hashmap-update-sample'
2017-12-13 Junio C HamanoMerge branch 'en/remove-stripspace'
2017-12-13 Junio C HamanoMerge branch 'jk/no-optional-locks'
2017-12-13 Junio C HamanoMerge branch 'ds/for-each-file-in-obj-micro-optim'
2017-12-13 Junio C HamanoMerge branch 'jk/progress-delay-fix'
2017-12-13 Junio C HamanoMerge branch 'ks/doc-checkout-previous'
2017-12-13 Junio C HamanoMerge branch 'fk/sendmail-from-path'
2017-12-13 Junio C HamanoMerge branch 'tg/t-readme-updates'
2017-12-13 Junio C HamanoMerge branch 'pc/submodule-helper'
2017-12-13 Junio C HamanoMerge branch 'jc/receive-pack-hook-doc'
2017-12-13 Junio C HamanoMerge branch 'ab/pcre2-grep'
2017-12-13 Junio C HamanoMerge branch 'ra/decorate-limit-refs'
2017-12-13 Junio C HamanoMerge branch 'bc/hash-algo'
2017-12-06 Junio C HamanoSync with maint
2017-12-06 Junio C HamanoMerge branch 'jn/ssh-wrappers'
2017-12-06 Junio C HamanoMerge branch 'bw/protocol-v1'
2017-12-06 Junio C HamanoMerge branch 'sp/doc-info-attributes'
2017-12-06 Junio C HamanoMerge branch 'ph/stash-save-m-option-fix'
2017-12-06 Junio C HamanoMerge branch 'jk/fewer-pack-rescan'
2017-12-06 Junio C HamanoMerge branch 'tg/deprecate-stash-save'
2017-12-06 Junio C HamanoMerge branch 'rd/doc-notes-prune-fix'
2017-12-06 Junio C HamanoMerge branch 'rd/man-reflog-add-n'
2017-12-06 Junio C HamanoMerge branch 'rd/man-prune-progress'
2017-12-06 Junio C HamanoMerge branch 'jt/submodule-tests-cleanup'
2017-12-06 Junio C HamanoMerge branch 'jn/reproducible-build'
2017-12-06 Junio C HamanoMerge branch 'cc/git-packet-pm'
2017-12-06 Junio C HamanoMerge branch 'ac/complete-pull-autostash'
2017-12-06 Junio C HamanoMerge branch 'hm/config-parse-expiry-date'
2017-12-06 Junio C HamanoMerge branch 'tz/branch-doc-remove-set-upstream'
2017-12-06 Junio C HamanoMerge branch 'cc/perf-run-config'
2017-12-06 Junio C HamanoMerge branch 'sb/submodule-recursive-checkout-detach...
2017-12-06 Junio C HamanoMerge branch 'jc/merge-base-fork-point-doc' into maint
2017-12-06 Junio C HamanoMerge branch 'tz/redirect-fix' into maint
2017-12-06 Junio C HamanoMerge branch 'tz/notes-error-to-stderr' into maint
2017-12-06 Junio C HamanoMerge branch 'sb/test-cherry-pick-submodule-getting...
2017-12-06 Junio C HamanoMerge branch 'rs/apply-inaccurate-eof-with-incomplete...
2017-12-06 Junio C HamanoMerge branch 'tz/complete-branch-copy' into maint
2017-12-06 Junio C HamanoMerge branch 'sd/branch-copy' into maint
2017-12-06 Junio C HamanoMerge branch 'sw/pull-ipv46-passthru' into maint
2017-12-06 Junio C HamanoMerge branch 'mh/avoid-rewriting-packed-refs' into...
2017-12-05 Junio C HamanoMerge branch 'ls/no-double-utf8-author-name' of .....
2017-11-28 Junio C HamanoSync with v2.15.1
2017-11-28 Junio C HamanoMerge branch 'rs/include-comments-before-the-function...
2017-11-28 Junio C HamanoMerge branch 'ma/branch-list-paginate'
2017-11-28 Junio C HamanoMerge branch 'jc/branch-name-sanity'
2017-11-27 Junio C HamanoSync with maint
2017-11-27 Junio C HamanoMerge branch 'sw/pull-ipv46-passthru'
2017-11-27 Junio C HamanoMerge branch 'ks/rebase-no-git-foo'
2017-11-27 Junio C HamanoMerge branch 'rs/config-write-section-fix'
2017-11-27 Junio C HamanoMerge branch 'ew/rebase-mboxrd'
2017-11-27 Junio C HamanoMerge branch 'tb/add-renormalize'
2017-11-27 Junio C HamanoMerge branch 'tz/complete-branch-copy'
2017-11-27 Junio C HamanoMerge branch 'rs/apply-inaccurate-eof-with-incomplete...
2017-11-27 Junio C HamanoMerge branch 'pw/sequencer-recover-from-unlockable...
2017-11-27 Junio C HamanoMerge branch 'sd/branch-copy'
2017-11-27 Junio C HamanoMerge branch 'sb/test-cherry-pick-submodule-getting...
2017-11-27 Junio C HamanoMerge branch 'tz/notes-error-to-stderr'
2017-11-27 Junio C HamanoMerge branch 'tz/redirect-fix'
2017-11-27 Junio C HamanoMerge branch 'rv/sendemail-tocmd-in-config-and-completion'
2017-11-27 Junio C HamanoMerge branch 'jc/merge-base-fork-point-doc'
2017-11-27 Junio C HamanoMerge branch 'jc/ignore-cr-at-eol'
2017-11-27 Junio C HamanoMerge branch 'rs/apply-fuzzy-match-fix' into maint
2017-11-27 Junio C HamanoMerge branch 'rs/imap-send-next-arg-fix' into maint
2017-11-27 Elijah Newrenmerge-recursive: ignore_case shouldn't reject intention...
2017-11-22 Junio C HamanoMerge branch 'jn/reproducible-build' of ../git-gui...
2017-11-21 Junio C HamanoSync with maint
2017-11-21 Junio C HamanoMerge branch 'rs/apply-fuzzy-match-fix'
2017-11-21 Junio C HamanoMerge branch 'ad/submitting-patches-title-decoration'
2017-11-21 Junio C HamanoMerge branch 'av/fsmonitor'
2017-11-21 Junio C HamanoMerge branch 'bp/fsmonitor'
2017-11-21 Junio C HamanoMerge branch 'cb/t4201-robustify' into maint
2017-11-21 Junio C HamanoMerge branch 'ad/rebase-i-serie-typofix' into maint
2017-11-21 Junio C HamanoMerge branch 'jk/info-alternates-fix' into maint
2017-11-21 Junio C HamanoMerge branch 'ab/pcre-v2' into maint
2017-11-21 Junio C HamanoMerge branch 'bw/rebase-i-ignored-submodule-fix' into...
2017-11-15 Elijah Newrenmerge-recursive: handle addition of submodule on our...
2017-11-15 Junio C HamanoSync with maint
2017-11-15 Junio C HamanoMerge branch 'bp/read-index-from-skip-verification'
2017-11-15 Junio C HamanoMerge branch 'bc/submitting-patches-in-asciidoc'
2017-11-15 Junio C HamanoMerge branch 'sb/bisect-run-empty'
2017-11-15 Junio C HamanoMerge branch 'rd/bisect-view-is-visualize'
2017-11-15 Junio C HamanoMerge branch 'jk/info-alternates-fix'
2017-11-15 Junio C HamanoMerge branch 'cb/t4201-robustify'
2017-11-15 Junio C HamanoMerge branch 'ab/pcre-v2'
next