Merge branch 'ab/nuke-emacs-contrib' into next
[gitweb.git] / merge-recursive.h
2018-03-15 Merge branch 'ab/nuke-emacs-contrib' into next
2018-03-15 Merge branch 'nd/remove-ignore-env-field' into next
2018-03-15 Merge branch 'js/rebase-recreate-merge' into next
2018-03-15 Merge branch 'ma/skip-writing-unchanged-index' into...
2018-03-15 Merge branch 'ma/config-page-only-in-list-mode' into...
2018-03-09 Merge branch 'tl/userdiff-csharp-async' into next
2018-03-09 Merge branch 'sg/cvs-tests-with-x' into next
2018-03-09 Merge branch 'ab/man-sec-list' into next
2018-03-09 Merge branch 'ab/perl-fixes' into next
2018-03-09 Merge branch 'cl/send-email-reply-to' into next
2018-03-09 Merge branch 'np/send-email-header-parsing' into next
2018-03-08 Sync with master
2018-03-08 Merge branch 'nd/object-allocation-comments' into next
2018-03-08 Merge branch 'jk/smart-http-protocol-doc-fix' into...
2018-03-08 Merge branch 'jk/add-i-diff-filter' into next
2018-03-08 Merge branch 'nd/parseopt-completion' into next
2018-03-08 Merge branch 'mk/doc-pretty-fill'
2018-03-08 Merge branch 'ds/mark-parents-uninteresting-optim'
2018-03-08 Merge branch 'ds/find-unique-abbrev-optim'
2018-03-08 Merge branch 'sg/travis-build-during-script-phase'
2018-03-06 Sync with master
2018-03-06 Merge branch 'pw/add-p-recount' into next
2018-03-06 Merge branch 'ab/pre-auto-gc-battery' into next
2018-03-06 Merge branch 'sg/test-x' into next
2018-03-06 Merge branch 'rj/test-i18ngrep' into next
2018-03-06 Merge branch 'ma/roll-back-lockfiles' into next
2018-03-06 Merge branch 'en/rename-directory-detection' into next
2018-03-06 Merge branch 'xz/send-email-batch-size'
2018-03-06 Merge branch 'sm/mv-dry-run-update'
2018-03-02 Merge branch 'mk/doc-pretty-fill' into next
2018-03-02 Merge branch 'ds/mark-parents-uninteresting-optim'...
2018-03-02 Merge branch 'ds/find-unique-abbrev-optim' into next
2018-03-02 Merge branch 'sg/travis-build-during-script-phase'...
2018-02-28 Merge branch 'tz/do-not-clean-spec-file'
2018-02-28 Merge branch 'gs/test-unset-xdg-cache-home'
2018-02-28 Merge branch 'tk/apply-dev-null-verify-name-fix'
2018-02-28 Merge branch 'sb/status-doc-fix'
2018-02-27 merge-recursive: fix overwriting dirty files involved...
2018-02-27 Merge branch 'xz/send-email-batch-size' into next
2018-02-27 Merge branch 'sm/mv-dry-run-update' into next
2018-02-27 Merge branch 'ys/bisect-object-id-missing-conversion...
2018-02-27 Merge branch 'nd/ita-wt-renames-in-status' into maint
2018-02-27 Merge branch 'jk/sq-dequote-on-bogus-input'
2018-02-27 Merge branch 'bp/fsmonitor'
2018-02-27 Merge branch 'bc/doc-interpret-trailers-grammofix'
2018-02-27 Merge branch 'sg/doc-test-must-fail-args'
2018-02-27 Merge branch 'rs/check-ignore-multi'
2018-02-27 Merge branch 'bp/name-hash-dirname-fix'
2018-02-21 Merge branch 'sb/status-doc-fix' into next
2018-02-21 Merge branch 'tk/apply-dev-null-verify-name-fix' into...
2018-02-21 Merge branch 'gs/test-unset-xdg-cache-home' into next
2018-02-21 Merge branch 'tz/do-not-clean-spec-file' into next
2018-02-15 Merge branch 'as/read-tree-prefix-doc-fix' into maint
2018-02-15 Merge branch 'jc/merge-symlink-ours-theirs' into maint
2018-02-15 Merge branch 'jm/svn-pushmergeinfo-fix' into maint
2018-02-15 Merge branch 'nd/ignore-glob-doc-update'
2018-02-15 Merge branch 'tg/reset-hard-show-head-with-pretty'
2018-02-15 Merge branch 'sb/pull-rebase-submodule'
2018-02-15 Merge branch 'jt/fsck-code-cleanup'
2018-02-14 Merge branch 'bp/fsmonitor' into next
2018-02-14 Merge branch 'jk/sq-dequote-on-bogus-input' into next
2018-02-14 Merge branch 'bc/doc-interpret-trailers-grammofix'...
2018-02-14 Merge branch 'sg/doc-test-must-fail-args' into next
2018-02-14 Merge branch 'rs/check-ignore-multi' into next
2018-02-14 Merge branch 'bp/name-hash-dirname-fix' into next
2018-02-14 merge-recursive: add computation of collisions due...
2018-02-14 merge-recursive: add get_directory_renames()
2018-02-13 Merge branch 'tz/doc-show-defaults-to-head'
2018-02-13 Merge branch 'jc/mailinfo-cleanup-fix'
2018-02-13 Merge branch 'rs/strbuf-cocci-workaround'
2018-02-13 Merge branch 'rb/hashmap-h-compilation-fix'
2018-02-13 Merge branch 'nd/diff-flush-before-warning'
2018-02-13 Merge branch 'cl/t9001-cleanup'
2018-02-08 Merge branch 'nd/ignore-glob-doc-update' into next
2018-02-08 Merge branch 'tg/reset-hard-show-head-with-pretty'...
2018-02-08 Merge branch 'sb/pull-rebase-submodule' into next
2018-02-08 Merge branch 'jt/fsck-code-cleanup' into next
2018-02-07 Merge branch 'tz/doc-show-defaults-to-head' into next
2018-02-07 Merge branch 'jc/mailinfo-cleanup-fix' into next
2018-02-07 Merge branch 'rs/strbuf-cocci-workaround' into next
2018-02-07 Merge branch 'rb/hashmap-h-compilation-fix' into next
2018-02-07 Merge branch 'nd/diff-flush-before-warning' into next
2018-02-07 Merge branch 'cl/t9001-cleanup' into next
2018-01-23 Merge branch 'as/read-tree-prefix-doc-fix'
2018-01-23 Merge branch 'ys/bisect-object-id-missing-conversion...
2018-01-23 Merge branch 'jc/merge-symlink-ours-theirs'
2018-01-23 Merge branch 'jm/svn-pushmergeinfo-fix'
2018-01-23 Merge branch 'nd/ita-wt-renames-in-status'
2018-01-11 Merge branch 'js/test-with-ws-in-path'
2018-01-09 Merge branch 'jk/doc-diff-options'
2018-01-09 Merge branch 'sg/travis-check-untracked'
2018-01-09 Merge branch 'js/test-with-ws-in-path'
2018-01-09 Merge branch 'sg/travis-skip-identical-test'
2018-01-09 Merge branch 'sg/travis-fixes'
2018-01-09 Merge branch 'js/misc-git-gui-stuff' of ../git-gui
2018-01-05 Merge branch 'jh/memihash-opt'
2017-12-28 Merge branch 'sr/http-sslverify-config-doc'
2017-12-28 Merge branch 'bp/fsmonitor'
2017-12-27 Merge branch 'sg/travis-fixes'
2017-12-27 Merge branch 'es/clone-shared-worktree'
next