Merge branch 'nd/submodule-status-fix'
[git] / merge-recursive.h
2018-05-08  Junio C HamanoMerge branch 'ab/git-svn-get-record-typofix'
2018-05-08  Junio C HamanoMerge branch 'sg/doc-gc-quote-mismatch-fix'
2018-04-25  Junio C HamanoMerge branch 'bp/fsmonitor-bufsize-fix'
2018-04-25  Junio C HamanoMerge branch 'es/fread-reads-dir-autoconf-fix'
2018-04-25  Junio C HamanoMerge branch 'js/t5404-path-fix'
2018-04-25  Junio C HamanoMerge branch 'mn/send-email-credential-doc'
2018-04-25  Junio C HamanoMerge branch 'ak/bisect-doc-typofix'
2018-04-25  Junio C HamanoMerge branch 'bw/commit-partial-from-subdirectory-fix'
2018-04-11  Junio C HamanoRevert "Merge branch 'en/rename-directory-detection'"
2018-04-11  Junio C HamanoMerge branch 'eb/cred-helper-ignore-sigpipe'
2018-04-11  Junio C HamanoMerge branch 'lv/tls-1.3'
2018-04-11  Junio C HamanoMerge branch 'pk/test-avoid-pipe-hiding-exit-status'
2018-04-11  Junio C HamanoMerge branch 'rs/status-with-removed-submodule'
2018-04-11  Junio C HamanoMerge branch 'nd/combined-test-helper'
2018-04-11  Junio C HamanoMerge branch 'sb/packfiles-in-repository'
2018-04-11  Junio C HamanoMerge branch 'sb/object-store'
2018-04-11  Junio C HamanoMerge branch 'jc/test-must-be-empty'
2018-04-11  Junio C HamanoMerge branch 'cc/perf-aggregate-sort'
2018-04-11  Junio C HamanoMerge branch 'ab/doc-hash-brokenness'
2018-04-11  Junio C HamanoMerge branch 'bc/hash-independent-tests'
2018-04-11  Junio C HamanoMerge branch 'ab/drop-contrib-examples'
2018-04-10  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion...
2018-04-10  Junio C HamanoMerge branch 'yk/filter-branch-non-committish-refs'
2018-04-10  Junio C HamanoMerge branch 'nd/trace-with-env'
2018-04-10  Junio C HamanoMerge branch 'nd/parseopt-completion-more'
2018-04-10  Junio C HamanoMerge branch 'ds/bsearch-hash'
2018-04-10  Junio C HamanoMerge branch 'ws/rebase-p'
2018-04-10  Junio C HamanoMerge branch 'jk/diff-highlight-graph-fix'
2018-04-10  Junio C HamanoMerge branch 'nd/remove-ignore-env-field'
2018-04-10  Junio C HamanoMerge branch 'ps/contains-id-error-message'
2018-04-09  Junio C HamanoMerge branch 'tg/stash-untracked-with-pathspec-fix'
2018-04-09  Junio C HamanoMerge branch 'nd/worktree-prune'
2018-04-09  Junio C HamanoMerge branch 'bc/object-id'
2018-04-09  Junio C HamanoMerge branch 'ma/shortlog-revparse'
2018-04-09  Junio C HamanoMerge branch 'ab/install-symlinks'
2018-04-09  Junio C HamanoMerge branch 'ml/filter-branch-no-op-error'
2018-04-09  Junio C HamanoMerge branch 'ab/pcre-v2'
2018-04-09  Junio C HamanoMerge branch 'ti/fetch-everything-local-optim'
2018-04-09  Junio C HamanoMerge branch 'en/rename-directory-detection'
2018-03-22  Junio C HamanoMerge branch 'sm/mv-dry-run-update' into maint
2018-03-22  Junio C HamanoMerge branch 'gs/test-unset-xdg-cache-home' into maint
2018-03-22  Junio C HamanoMerge branch 'sb/status-doc-fix' into maint
2018-03-22  Junio C HamanoMerge branch 'bp/fsmonitor' into maint
2018-03-22  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'...
2018-03-22  Junio C HamanoMerge branch 'sg/doc-test-must-fail-args' into maint
2018-03-22  Junio C HamanoMerge branch 'nd/ignore-glob-doc-update' into maint
2018-03-22  Junio C HamanoMerge branch 'tz/doc-show-defaults-to-head' into maint
2018-03-22  Junio C HamanoMerge branch 'jc/mailinfo-cleanup-fix' into maint
2018-03-22  Junio C HamanoMerge branch 'rb/hashmap-h-compilation-fix' into maint
2018-03-22  Junio C HamanoMerge branch 'cl/t9001-cleanup' into maint
2018-03-22  Junio C HamanoMerge branch 'jt/fsck-code-cleanup' into maint
2018-03-22  Junio C HamanoMerge branch 'nd/diff-flush-before-warning' into maint
2018-03-22  Junio C HamanoMerge branch 'sg/travis-build-during-script-phase'...
2018-03-21  Junio C HamanoMerge branch 'dp/merge-strategy-doc-fix'
2018-03-21  Junio C HamanoMerge branch 'ks/t3200-typofix'
2018-03-08  Junio C HamanoMerge branch 'mk/doc-pretty-fill'
2018-03-08  Junio C HamanoMerge branch 'ds/mark-parents-uninteresting-optim'
2018-03-08  Junio C HamanoMerge branch 'ds/find-unique-abbrev-optim'
2018-03-08  Junio C HamanoMerge branch 'sg/travis-build-during-script-phase'
2018-03-06  Junio C HamanoMerge branch 'xz/send-email-batch-size'
2018-03-06  Junio C HamanoMerge branch 'sm/mv-dry-run-update'
2018-03-06  Junio C HamanoMerge branch 'cb/ttk-style' of git-gui into cb/git...
2018-03-02  Junio C HamanoMerge branch 'bb/ssh-key-files' of git-gui into bb...
2018-03-02  Junio C HamanoMerge branch 'bp/bind-kp-enter' of git-gui into bp...
2018-02-28  Junio C HamanoMerge branch 'tz/do-not-clean-spec-file'
2018-02-28  Junio C HamanoMerge branch 'gs/test-unset-xdg-cache-home'
2018-02-28  Junio C HamanoMerge branch 'tk/apply-dev-null-verify-name-fix'
2018-02-28  Junio C HamanoMerge branch 'sb/status-doc-fix'
2018-02-27  Elijah Newrenmerge-recursive: fix overwriting dirty files involved...
2018-02-27  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion...
2018-02-27  Junio C HamanoMerge branch 'nd/ita-wt-renames-in-status' into maint
2018-02-27  Junio C HamanoMerge branch 'jk/sq-dequote-on-bogus-input'
2018-02-27  Junio C HamanoMerge branch 'bp/fsmonitor'
2018-02-27  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'
2018-02-27  Junio C HamanoMerge branch 'sg/doc-test-must-fail-args'
2018-02-27  Junio C HamanoMerge branch 'rs/check-ignore-multi'
2018-02-27  Junio C HamanoMerge branch 'bp/name-hash-dirname-fix'
2018-02-15  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix' into maint
2018-02-15  Junio C HamanoMerge branch 'jc/merge-symlink-ours-theirs' into maint
2018-02-15  Junio C HamanoMerge branch 'jm/svn-pushmergeinfo-fix' into maint
2018-02-15  Junio C HamanoMerge branch 'nd/ignore-glob-doc-update'
2018-02-15  Junio C HamanoMerge branch 'tg/reset-hard-show-head-with-pretty'
2018-02-15  Junio C HamanoMerge branch 'sb/pull-rebase-submodule'
2018-02-15  Junio C HamanoMerge branch 'jt/fsck-code-cleanup'
2018-02-14  Elijah Newrenmerge-recursive: add computation of collisions due...
2018-02-14  Elijah Newrenmerge-recursive: add get_directory_renames()
2018-02-13  Junio C HamanoMerge branch 'tz/doc-show-defaults-to-head'
2018-02-13  Junio C HamanoMerge branch 'jc/mailinfo-cleanup-fix'
2018-02-13  Junio C HamanoMerge branch 'rs/strbuf-cocci-workaround'
2018-02-13  Junio C HamanoMerge branch 'rb/hashmap-h-compilation-fix'
2018-02-13  Junio C HamanoMerge branch 'nd/diff-flush-before-warning'
2018-02-13  Junio C HamanoMerge branch 'cl/t9001-cleanup'
2018-01-23  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix'
2018-01-23  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion...
2018-01-23  Junio C HamanoMerge branch 'jc/merge-symlink-ours-theirs'
2018-01-23  Junio C HamanoMerge branch 'jm/svn-pushmergeinfo-fix'
2018-01-23  Junio C HamanoMerge branch 'nd/ita-wt-renames-in-status'
2018-01-11  Junio C HamanoMerge branch 'js/test-with-ws-in-path'
2018-01-09  Junio C HamanoMerge branch 'jk/doc-diff-options'
2018-01-09  Junio C HamanoMerge branch 'sg/travis-check-untracked'
next