git.ipfire.org Git - thirdparty/git.git/history

]> git.ipfire.org Git - thirdparty/git.git/history - builtin/merge.c

projects / thirdparty / git.git / history

[thirdparty/git.git] / builtin / merge.c

2022-09-01	Junio C Hamano	Merge branch 'en/merge-unstash-only-on-clean-merge'	blob \| commitdiff \| raw
2022-09-01	Junio C Hamano	Merge branch 'sg/parse-options-subcommand'	blob \| commitdiff \| raw \| diff to current
2022-09-01	Junio C Hamano	Merge branch 'ds/bundle-uri-clone'	blob \| commitdiff \| raw \| diff to current
2022-08-30	Junio C Hamano	Sync with Git 2.37.3	blob \| commitdiff \| raw \| diff to current
2022-08-29	Junio C Hamano	Merge branch 'ds/github-actions-use-newer-ubuntu'	blob \| commitdiff \| raw \| diff to current
2022-08-29	Junio C Hamano	Merge branch 'ad/preload-plug-memleak'	blob \| commitdiff \| raw \| diff to current
2022-08-29	Junio C Hamano	Merge branch 'sg/xcalloc-cocci-fix'	blob \| commitdiff \| raw \| diff to current
2022-08-29	Junio C Hamano	Merge branch 'tl/trace2-config-scope'	blob \| commitdiff \| raw \| diff to current
2022-08-29	Junio C Hamano	Merge branch 'vd/fix-perf-tests'	blob \| commitdiff \| raw \| diff to current
2022-08-29	Junio C Hamano	Merge branch 'mt/rot13-in-c'	blob \| commitdiff \| raw \| diff to current
2022-08-29	Junio C Hamano	Merge branch 'ds/decorate-filter-tweak'	blob \| commitdiff \| raw \| diff to current
2022-08-26	Junio C Hamano	Sync with 'maint'	blob \| commitdiff \| raw \| diff to current
2022-08-26	Junio C Hamano	Merge branch 'po/doc-add-renormalize' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-26	Junio C Hamano	Merge branch 'ab/hooks-regression-fix' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-26	Junio C Hamano	Merge branch 'js/ort-clean-up-after-failed-merge' into...	blob \| commitdiff \| raw \| diff to current
2022-08-26	Junio C Hamano	Merge branch 'js/lstat-mingw-enotdir-fix' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-25	Junio C Hamano	Merge branch 'vd/scalar-generalize-diagnose'	blob \| commitdiff \| raw \| diff to current
2022-08-25	Junio C Hamano	Merge branch 'jk/pipe-command-nonblock'	blob \| commitdiff \| raw \| diff to current
2022-08-25	Junio C Hamano	Merge branch 'jk/is-promisor-object-keep-tree-in-use'	blob \| commitdiff \| raw \| diff to current
2022-08-25	Junio C Hamano	Merge branch 'en/submodule-merge-messages-fixes'	blob \| commitdiff \| raw \| diff to current
2022-08-24	Elijah Newren	merge: only apply autostash when appropriate	blob \| commitdiff \| raw \| diff to current
2022-08-18	Junio C Hamano	Merge branch 'vd/sparse-reset-checkout-fixes'	blob \| commitdiff \| raw \| diff to current
2022-08-18	Junio C Hamano	Merge branch 'ds/bundle-uri-more'	blob \| commitdiff \| raw \| diff to current
2022-08-18	Junio C Hamano	Merge branch 'jk/fsck-tree-mode-bits-fix'	blob \| commitdiff \| raw \| diff to current
2022-08-18	Junio C Hamano	Merge branch 'fc/vimdiff-layout-vimdiff3-fix'	blob \| commitdiff \| raw \| diff to current
2022-08-18	Junio C Hamano	Merge branch 'po/doc-add-renormalize'	blob \| commitdiff \| raw \| diff to current
2022-08-15	Junio C Hamano	Merge branch 'js/safe-directory-plus'	blob \| commitdiff \| raw \| diff to current
2022-08-15	Junio C Hamano	Merge branch 'pw/use-glibc-tunable-for-malloc-optim'	blob \| commitdiff \| raw \| diff to current
2022-08-15	Junio C Hamano	Merge branch 'ab/tech-docs-to-help'	blob \| commitdiff \| raw \| diff to current
2022-08-15	Junio C Hamano	Merge branch 'jc/rerere-autoupdate-doc'	blob \| commitdiff \| raw \| diff to current
2022-08-15	Junio C Hamano	Merge branch 'ab/hooks-regression-fix'	blob \| commitdiff \| raw \| diff to current
2022-08-12	Junio C Hamano	Merge branch 'ab/plug-revisions-leak'	blob \| commitdiff \| raw \| diff to current
2022-08-12	Junio C Hamano	Merge branch 'ab/leak-check'	blob \| commitdiff \| raw \| diff to current
2022-08-12	Junio C Hamano	Merge branch 'gc/git-reflog-doc-markup'	blob \| commitdiff \| raw \| diff to current
2022-08-12	Junio C Hamano	Merge branch 'lt/symbolic-ref-sanity'	blob \| commitdiff \| raw \| diff to current
2022-08-11	Junio C Hamano	Sync with Git 2.37.2	blob \| commitdiff \| raw \| diff to current
2022-08-11	Junio C Hamano	Merge branch 'jc/string-list-cleanup' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-11	Junio C Hamano	Merge branch 'mt/pkt-line-comment-tweak' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-11	Junio C Hamano	Merge branch 'tb/commit-graph-genv2-upgrade-fix' into...	blob \| commitdiff \| raw \| diff to current
2022-08-11	Junio C Hamano	Merge branch 'tk/untracked-cache-with-uall' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-11	Junio C Hamano	Merge branch 'hx/lookup-commit-in-graph-fix' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-11	Junio C Hamano	Merge branch 'jc/resolve-undo' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-08	Junio C Hamano	Merge branch 'vd/sparse-reset-checkout-fixes' into...	blob \| commitdiff \| raw \| diff to current
2022-08-08	Junio C Hamano	Merge branch 'js/ort-clean-up-after-failed-merge'	blob \| commitdiff \| raw \| diff to current
2022-08-08	Junio C Hamano	Merge branch 'jk/struct-zero-init-with-older-gcc'	blob \| commitdiff \| raw \| diff to current
2022-08-08	Junio C Hamano	Merge branch 'js/t5351-freebsd-fix'	blob \| commitdiff \| raw \| diff to current
2022-08-08	Junio C Hamano	Merge branch 'js/lstat-mingw-enotdir-fix'	blob \| commitdiff \| raw \| diff to current
2022-08-08	Junio C Hamano	Merge branch 'js/mingw-with-python'	blob \| commitdiff \| raw \| diff to current
2022-08-08	Junio C Hamano	Merge branch 'ca/unignore-local-installation-on-windows'	blob \| commitdiff \| raw \| diff to current
2022-08-05	Junio C Hamano	Sync with 'maint'	blob \| commitdiff \| raw \| diff to current
2022-08-05	Junio C Hamano	Merge branch 'tb/cat-file-z'	blob \| commitdiff \| raw \| diff to current
2022-08-05	Junio C Hamano	Merge branch 'jt/fetch-pack-trace2-filter-spec'	blob \| commitdiff \| raw \| diff to current
2022-08-05	Junio C Hamano	Merge branch 'jr/gitweb-title-shortening'	blob \| commitdiff \| raw \| diff to current
2022-08-05	Junio C Hamano	Merge branch 'gc/bare-repo-discovery'	blob \| commitdiff \| raw \| diff to current
2022-08-05	Junio C Hamano	Merge branch 'mb/config-document-include' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-05	Junio C Hamano	Merge branch 'rs/mingw-tighten-mkstemp' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-05	Junio C Hamano	Merge branch 'jk/clone-unborn-confusion' into maint	blob \| commitdiff \| raw \| diff to current
2022-08-03	Junio C Hamano	Merge branch 'jc/string-list-cleanup'	blob \| commitdiff \| raw \| diff to current
2022-08-03	Junio C Hamano	Merge branch 'en/merge-restore-to-pristine'	blob \| commitdiff \| raw \| diff to current
2022-08-03	Junio C Hamano	Merge branch 'rs/mergesort'	blob \| commitdiff \| raw \| diff to current
2022-08-03	Junio C Hamano	Merge branch 'sa/cat-file-mailmap'	blob \| commitdiff \| raw \| diff to current
2022-08-03	Junio C Hamano	Merge branch 'zh/ls-files-format'	blob \| commitdiff \| raw \| diff to current
2022-08-03	Junio C Hamano	Merge branch 'tb/commit-graph-genv2-upgrade-fix'	blob \| commitdiff \| raw \| diff to current
2022-08-03	Junio C Hamano	Merge branch 'tk/untracked-cache-with-uall'	blob \| commitdiff \| raw \| diff to current
2022-08-03	Junio C Hamano	Merge branch 'pw/xdiff-alloc'	blob \| commitdiff \| raw \| diff to current
2022-08-03	Junio C Hamano	Merge branch 'ds/midx-with-less-memory'	blob \| commitdiff \| raw \| diff to current
2022-08-01	Junio C Hamano	Merge branch 'mt/pkt-line-comment-tweak'	blob \| commitdiff \| raw \| diff to current
2022-08-01	Junio C Hamano	Merge branch 'mt/checkout-count-fix'	blob \| commitdiff \| raw \| diff to current
2022-08-01	Junio C Hamano	Merge branch 'cl/rerere-train-with-no-sign'	blob \| commitdiff \| raw \| diff to current
2022-08-01	Junio C Hamano	Merge branch 'ds/rebase-update-ref'	blob \| commitdiff \| raw \| diff to current
2022-08-01	Junio C Hamano	Merge branch 'kk/p4-client-name-encoding-fix'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Sync with 'maint'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'tk/rev-parse-doc-clarify-at-u' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'en/t6429-test-must-be-empty-fix' into...	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'cr/setup-bug-typo' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'pb/diff-doc-raw-format' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'jk/revisions-doc-markup-fix' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'rs/combine-diff-with-incompatible-options...	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'ac/bitmap-format-doc' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'ro/mktree-allow-missing-fix' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'gg/worktree-from-the-above' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'fr/vimdiff-layout-fix' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'en/merge-dual-dir-renames-fix' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'js/vimdiff-quotepath-fix' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'js/ci-github-workflow-markup' into maint	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'mb/p4-utf16-crlf'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'ds/win-syslog-compiler-fix'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'ld/osx-keychain-usage-fix'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'vd/scalar-doc'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'ds/doc-wo-whitelist'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'mb/config-document-include'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'sg/index-format-doc-update'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'ma/sparse-checkout-cone-doc-fix'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'ma/t4200-update'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'tl/pack-bitmap-error-messages'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'ab/squelch-empty-fsync-traces'	blob \| commitdiff \| raw \| diff to current
2022-07-27	Junio C Hamano	Merge branch 'js/commit-graph-parsing-without-repo...	blob \| commitdiff \| raw \| diff to current
2022-07-23	Elijah Newren	merge: do not exit restore_state() prematurely	blob \| commitdiff \| raw \| diff to current
2022-07-23	Elijah Newren	merge: ensure we can actually restore pre-merge state	blob \| commitdiff \| raw \| diff to current
2022-07-23	Elijah Newren	merge: make restore_state() restore staged state too	blob \| commitdiff \| raw \| diff to current
next

Unnamed repository; edit this file 'description' to name the repository.

RSS Atom