projects / git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
Sync with 2.15.3
[git] / merge-recursive.c
2018-09-27  Junio C HamanoSync with 2.15.3 blob | commitdiff | raw
2018-09-27  Junio C HamanoSync with Git 2.14.4 blob | commitdiff | raw | diff to current
2018-05-22  Junio C HamanoSync with Git 2.15.2 blob | commitdiff | raw
2018-05-22  Junio C HamanoSync with Git 2.14.4 blob | commitdiff | raw | diff to current
2018-05-22  Junio C HamanoSync with Git 2.13.7 blob | commitdiff | raw | diff to current
2018-03-22  Junio C HamanoMerge branch 'sm/mv-dry-run-update' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'tg/worktree-create-tracking' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'gs/test-unset-xdg-cache-home' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'sb/status-doc-fix' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'rd/typofix' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'bp/fsmonitor' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'bc/doc-interpret-trailers-grammofix'... blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'sg/doc-test-must-fail-args' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'rj/sparse-updates' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'jk/gettext-poison' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'nd/ignore-glob-doc-update' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'rs/cocci-strbuf-addf-to-addstr' into... blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'jc/worktree-add-short-help' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'tz/doc-show-defaults-to-head' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'nd/shared-index-fix' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'jc/mailinfo-cleanup-fix' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'rb/hashmap-h-compilation-fix' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'rs/describe-unique-abbrev' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'ks/submodule-doc-updates' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'cl/t9001-cleanup' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'bw/oidmap-autoinit' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'sg/test-i18ngrep' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'jt/fsck-code-cleanup' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'ew/svn-branch-segfault-fix' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'nd/list-merge-strategy' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'jk/daemon-fixes' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'tg/split-index-fixes' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'mr/packed-ref-store-fix' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'jt/http-redact-cookies' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'nd/diff-flush-before-warning' into maint blob | commitdiff | raw
2018-03-22  Junio C HamanoMerge branch 'sg/travis-build-during-script-phase'... blob | commitdiff | raw
2018-02-27  Junio C HamanoMerge branch 'ys/bisect-object-id-missing-conversion... blob | commitdiff | raw
2018-02-27  Junio C HamanoMerge branch 'sb/submodule-update-reset-fix' into maint blob | commitdiff | raw
2018-02-27  Junio C HamanoMerge branch 'ab/commit-m-with-fixup' into maint blob | commitdiff | raw
2018-02-27  Junio C HamanoMerge branch 'nd/ita-wt-renames-in-status' into maint blob | commitdiff | raw
2018-02-15  Junio C HamanoMerge branch 'ab/doc-cat-file-e-still-shows-errors... blob | commitdiff | raw
2018-02-15  Junio C HamanoMerge branch 'as/read-tree-prefix-doc-fix' into maint blob | commitdiff | raw
2018-02-15  Junio C HamanoMerge branch 'nd/add-i-ignore-submodules' into maint blob | commitdiff | raw
2018-02-15  Junio C HamanoMerge branch 'tg/stash-with-pathspec-fix' into maint blob | commitdiff | raw
2018-02-15  Junio C HamanoMerge branch 'jk/abort-clone-with-existing-dest' into... blob | commitdiff | raw
2018-02-15  Junio C HamanoMerge branch 'jc/merge-symlink-ours-theirs' into maint blob | commitdiff | raw
2018-02-15  Junio C HamanoMerge branch 'rs/lose-leak-pending' into maint blob | commitdiff | raw | diff to current
2018-02-15  Junio C HamanoMerge branch 'jm/svn-pushmergeinfo-fix' into maint blob | commitdiff | raw | diff to current
2018-02-15  Junio C HamanoMerge branch 'dk/describe-all-output-fix' into maint blob | commitdiff | raw | diff to current
2018-02-15  Junio C HamanoMerge branch 'ab/perf-grep-threads' into maint blob | commitdiff | raw | diff to current
2018-01-22  Junio C HamanoMerge branch 'bc/hash-algo' into maint blob | commitdiff | raw | diff to current
2018-01-16  Junio C HamanoMerge tag 'l10n-2.16.0-rnd2' of git://github.com/git... blob | commitdiff | raw | diff to current
2018-01-11  Junio C HamanoMerge branch 'jh/object-filtering' blob | commitdiff | raw | diff to current
2018-01-11  Junio C HamanoMerge branch 'tg/worktree-create-tracking' blob | commitdiff | raw | diff to current
2018-01-11  Junio C HamanoMerge branch 'js/test-with-ws-in-path' blob | commitdiff | raw | diff to current
2018-01-10  Junio C HamanoMerge branch 'js/perl-path-workaround-in-tests' blob | commitdiff | raw | diff to current
2018-01-10  Junio C HamanoMerge branch 'ew/empty-merge-with-dirty-index' blob | commitdiff | raw | diff to current
2018-01-10  Junio C HamanoMerge branch 'ma/bisect-leakfix' blob | commitdiff | raw | diff to current
2018-01-10  Junio C HamanoMerge branch 'js/fix-merge-arg-quoting-in-rebase-p' blob | commitdiff | raw | diff to current
2018-01-09  Junio C HamanoMerge branch 'jk/doc-diff-options' blob | commitdiff | raw | diff to current
2018-01-09  Junio C HamanoMerge branch 'bw/protocol-v1' blob | commitdiff | raw | diff to current
2018-01-09  Junio C HamanoMerge branch 'sg/travis-check-untracked' blob | commitdiff | raw | diff to current
2018-01-09  Junio C HamanoMerge branch 'js/test-with-ws-in-path' blob | commitdiff | raw | diff to current
2018-01-09  Junio C HamanoMerge branch 'bc/submitting-patches-in-asciidoc' blob | commitdiff | raw | diff to current
2018-01-09  Junio C HamanoMerge branch 'sg/travis-skip-identical-test' blob | commitdiff | raw | diff to current
2018-01-09  Junio C HamanoMerge branch 'ab/dc-sha1-loose-ends' blob | commitdiff | raw | diff to current
2018-01-09  Junio C HamanoMerge branch 'sg/travis-fixes' blob | commitdiff | raw | diff to current
2018-01-09  Junio C HamanoMerge branch 'js/misc-git-gui-stuff' of ../git-gui blob | commitdiff | raw | diff to current
2018-01-09  Junio C HamanoMerge branch 'ew/empty-merge-with-dirty-index-maint... blob | commitdiff | raw | diff to current
2018-01-09  Junio C Hamanomerge-recursive: do not look at the index during recurs... blob | commitdiff | raw | diff to current
2018-01-06  Jiang XinMerge branch 'master' of git://github.com/git-l10n... blob | commitdiff | raw | diff to current
2018-01-05  Junio C HamanoMerge branch 'js/sequencer-cleanups' blob | commitdiff | raw | diff to current
2018-01-05  Junio C HamanoMerge branch 'jh/memihash-opt' blob | commitdiff | raw | diff to current
2018-01-05  Junio C HamanoMerge branch 'tb/test-lint-wc-l' blob | commitdiff | raw | diff to current
2018-01-05  Junio C HamanoMerge branch 'rs/use-argv-array-in-child-process' blob | commitdiff | raw | diff to current
2018-01-05  Junio C HamanoMerge branch 'ld/p4-multiple-shelves' blob | commitdiff | raw | diff to current
2018-01-05  Junio C HamanoMerge branch 'jd/fix-strbuf-add-urlencode-bytes' blob | commitdiff | raw | diff to current
2018-01-05  Junio C HamanoMerge branch 'ew/empty-merge-with-dirty-index' blob | commitdiff | raw | diff to current
2018-01-05  Junio C HamanoMerge branch 'db/doc-config-section-names-with-bs' blob | commitdiff | raw | diff to current
2018-01-05  Junio C HamanoMerge branch 'jk/test-suite-tracing' blob | commitdiff | raw | diff to current
2018-01-03  Junio C Hamanomerge: teach -Xours/-Xtheirs to symbolic link merge blob | commitdiff | raw | diff to current
2017-12-31  Jiang XinMerge branch 'maint' of git://github.com/git-l10n/git-po blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'sb/describe-blob' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'hi/merge-verify-sig-config' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'ws/curl-http-proxy-over-https' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'ks/doc-previous-checkout' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'ks/rebase-error-messages' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'sr/http-sslverify-config-doc' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'nm/imap-send-quote-server-folder-name' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'bp/fsmonitor' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'jh/partial-clone-doc' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'jt/transport-hide-vtable' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'js/enhanced-version-info' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'tz/lib-git-svn-svnserve-tests' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'ew/svn-crlf' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'cc/skip-to-optional-val' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'ra/prompt-eread-fix' blob | commitdiff | raw | diff to current
2017-12-28  Junio C HamanoMerge branch 'bw/path-doc' blob | commitdiff | raw | diff to current
2017-12-27  Junio C HamanoMerge branch 'rb/quick-install-doc' blob | commitdiff | raw | diff to current
2017-12-27  Junio C HamanoMerge branch 'jt/transport-no-more-rsync' blob | commitdiff | raw | diff to current
next
Unnamed repository; edit this file 'description' to name the repository.