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

]> git.ipfire.org Git - thirdparty/git.git/history - git-merge-resolve.sh

projects / thirdparty / git.git / history

[thirdparty/git.git] / git-merge-resolve.sh

2022-09-19	Junio C Hamano	Merge branch 'jk/list-objects-filter-cleanup'	blob \| commitdiff \| raw
2022-09-19	Junio C Hamano	Merge branch 'zh/ls-files-format'	blob \| commitdiff \| raw
2022-09-19	Junio C Hamano	Merge branch 'sy/mv-out-of-cone'	blob \| commitdiff \| raw
2022-09-15	Junio C Hamano	Merge branch 'jk/proto-v2-ref-prefix-fix'	blob \| commitdiff \| raw
2022-09-15	Junio C Hamano	Merge branch 'rs/add-p-worktree-mode-prompt-fix'	blob \| commitdiff \| raw
2022-09-14	Junio C Hamano	Merge branch 'jk/plug-list-object-filter-leaks'	blob \| commitdiff \| raw
2022-09-14	Junio C Hamano	Merge branch 'ab/submodule-helper-leakfix'	blob \| commitdiff \| raw
2022-09-14	Junio C Hamano	Merge branch 'ab/dedup-config-and-command-docs'	blob \| commitdiff \| raw
2022-09-13	Junio C Hamano	Sync with 'maint'	blob \| commitdiff \| raw
2022-09-13	Junio C Hamano	Merge branch 'ow/rev-parse-parseopt-fix'	blob \| commitdiff \| raw
2022-09-13	Junio C Hamano	Merge branch 'js/builtin-add-p-portability-fix'	blob \| commitdiff \| raw
2022-09-13	Junio C Hamano	Merge branch 'sg/parse-options-subcommand'	blob \| commitdiff \| raw
2022-09-13	Junio C Hamano	Merge branch 'jk/rev-list-verify-objects-fix'	blob \| commitdiff \| raw
2022-09-13	Junio C Hamano	Merge branch 'rs/diff-no-index-cleanup'	blob \| commitdiff \| raw
2022-09-13	Junio C Hamano	Merge branch 'ab/submodule-helper-prep'	blob \| commitdiff \| raw
2022-09-09	Junio C Hamano	Merge branch 'vd/sparse-reset-checkout-fixes'	blob \| commitdiff \| raw
2022-09-09	Junio C Hamano	Merge branch 'cc/doc-trailer-whitespace-rules'	blob \| commitdiff \| raw
2022-09-09	Junio C Hamano	Merge branch 'js/add-p-diff-parsing-fix'	blob \| commitdiff \| raw
2022-09-06	Junio C Hamano	Merge branch 'jk/test-crontab-fixes'	blob \| commitdiff \| raw
2022-09-06	Junio C Hamano	Merge branch 'bc/gc-crontab-fix'	blob \| commitdiff \| raw
2022-09-06	Junio C Hamano	Merge branch 'rs/tempfile-cleanup-race-fix'	blob \| commitdiff \| raw
2022-09-06	Junio C Hamano	Merge branch 'tb/midx-with-changing-preferred-pack...	blob \| commitdiff \| raw
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
2022-09-01	Junio C Hamano	Merge branch 'ds/bundle-uri-clone'	blob \| commitdiff \| raw
2022-08-30	Junio C Hamano	Merge branch 'rs/tempfile-cleanup-race-fix' into jk...	blob \| commitdiff \| raw
2022-08-30	Junio C Hamano	Sync with Git 2.37.3	blob \| commitdiff \| raw
2022-08-29	Junio C Hamano	Merge branch 'ds/github-actions-use-newer-ubuntu'	blob \| commitdiff \| raw
2022-08-29	Junio C Hamano	Merge branch 'ad/preload-plug-memleak'	blob \| commitdiff \| raw
2022-08-29	Junio C Hamano	Merge branch 'sg/xcalloc-cocci-fix'	blob \| commitdiff \| raw
2022-08-29	Junio C Hamano	Merge branch 'tl/trace2-config-scope'	blob \| commitdiff \| raw
2022-08-29	Junio C Hamano	Merge branch 'vd/fix-perf-tests'	blob \| commitdiff \| raw
2022-08-29	Junio C Hamano	Merge branch 'mt/rot13-in-c'	blob \| commitdiff \| raw
2022-08-29	Junio C Hamano	Merge branch 'ds/decorate-filter-tweak'	blob \| commitdiff \| raw
2022-08-26	Junio C Hamano	Sync with 'maint'	blob \| commitdiff \| raw
2022-08-25	Junio C Hamano	Merge branch 'vd/scalar-generalize-diagnose'	blob \| commitdiff \| raw
2022-08-25	Junio C Hamano	Merge branch 'jk/pipe-command-nonblock'	blob \| commitdiff \| raw
2022-08-25	Junio C Hamano	Merge branch 'jk/is-promisor-object-keep-tree-in-use'	blob \| commitdiff \| raw
2022-08-25	Junio C Hamano	Merge branch 'en/submodule-merge-messages-fixes'	blob \| commitdiff \| raw
2022-08-18	Junio C Hamano	Merge branch 'vd/sparse-reset-checkout-fixes'	blob \| commitdiff \| raw
2022-08-18	Junio C Hamano	Merge branch 'ds/bundle-uri-more'	blob \| commitdiff \| raw
2022-08-18	Junio C Hamano	Merge branch 'jk/fsck-tree-mode-bits-fix'	blob \| commitdiff \| raw
2022-08-18	Junio C Hamano	Merge branch 'fc/vimdiff-layout-vimdiff3-fix'	blob \| commitdiff \| raw
2022-08-18	Junio C Hamano	Merge branch 'po/doc-add-renormalize'	blob \| commitdiff \| raw
2022-08-15	Junio C Hamano	Merge branch 'js/safe-directory-plus'	blob \| commitdiff \| raw
2022-08-15	Junio C Hamano	Merge branch 'pw/use-glibc-tunable-for-malloc-optim'	blob \| commitdiff \| raw
2022-08-15	Junio C Hamano	Merge branch 'ab/tech-docs-to-help'	blob \| commitdiff \| raw
2022-08-15	Junio C Hamano	Merge branch 'jc/rerere-autoupdate-doc'	blob \| commitdiff \| raw
2022-08-15	Junio C Hamano	Merge branch 'ab/hooks-regression-fix'	blob \| commitdiff \| raw
2022-08-12	Junio C Hamano	Merge branch 'ab/plug-revisions-leak'	blob \| commitdiff \| raw
2022-08-12	Junio C Hamano	Merge branch 'ab/leak-check'	blob \| commitdiff \| raw
2022-08-12	Junio C Hamano	Merge branch 'gc/git-reflog-doc-markup'	blob \| commitdiff \| raw
2022-08-12	Junio C Hamano	Merge branch 'lt/symbolic-ref-sanity'	blob \| commitdiff \| raw
2022-08-11	Junio C Hamano	Sync with Git 2.37.2	blob \| commitdiff \| raw
2022-08-08	Junio C Hamano	Merge branch 'vd/sparse-reset-checkout-fixes' into...	blob \| commitdiff \| raw
2022-08-08	Junio C Hamano	Merge branch 'js/ort-clean-up-after-failed-merge'	blob \| commitdiff \| raw
2022-08-08	Junio C Hamano	Merge branch 'jk/struct-zero-init-with-older-gcc'	blob \| commitdiff \| raw
2022-08-08	Junio C Hamano	Merge branch 'js/t5351-freebsd-fix'	blob \| commitdiff \| raw
2022-08-08	Junio C Hamano	Merge branch 'js/lstat-mingw-enotdir-fix'	blob \| commitdiff \| raw
2022-08-08	Junio C Hamano	Merge branch 'js/mingw-with-python'	blob \| commitdiff \| raw
2022-08-08	Junio C Hamano	Merge branch 'ca/unignore-local-installation-on-windows'	blob \| commitdiff \| raw
2022-08-05	Junio C Hamano	Sync with 'maint'	blob \| commitdiff \| raw
2022-08-05	Junio C Hamano	Merge branch 'tb/cat-file-z'	blob \| commitdiff \| raw
2022-08-05	Junio C Hamano	Merge branch 'jt/fetch-pack-trace2-filter-spec'	blob \| commitdiff \| raw
2022-08-05	Junio C Hamano	Merge branch 'jr/gitweb-title-shortening'	blob \| commitdiff \| raw
2022-08-05	Junio C Hamano	Merge branch 'gc/bare-repo-discovery'	blob \| commitdiff \| raw
2022-08-03	Junio C Hamano	Merge branch 'jc/string-list-cleanup'	blob \| commitdiff \| raw
2022-08-03	Junio C Hamano	Merge branch 'en/merge-restore-to-pristine'	blob \| commitdiff \| raw
2022-07-23	Elijah Newren	merge-resolve: abort if index does not match HEAD	blob \| commitdiff \| raw
2022-05-11	Junio C Hamano	Merge branch 'master' of git://git.ozlabs.org/~paulus...	blob \| commitdiff \| raw \| diff to current
2021-11-04	Junio C Hamano	Merge branch 'vd/pthread-setspecific-g11-fix' into...	blob \| commitdiff \| raw \| diff to current
2021-11-04	Junio C Hamano	Merge branch 'vd/pthread-setspecific-g11-fix'	blob \| commitdiff \| raw \| diff to current
2021-03-04	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2021-03-01	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-12-18	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-10-17	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-10-03	Junio C Hamano	Merge remote-tracking branch 'paulus/master' into pm...	blob \| commitdiff \| raw \| diff to current
2020-07-31	Junio C Hamano	Merge branch 'jb/doc-packfile-name' into master	blob \| commitdiff \| raw \| diff to current
2020-07-20	Junio C Hamano	Merge https://github.com/prati0100/git-gui into master	blob \| commitdiff \| raw \| diff to current
2020-05-21	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-04-22	Junio C Hamano	Merge branch 'dl/wrapper-fix-indentation'	blob \| commitdiff \| raw \| diff to current
2020-03-19	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2020-01-08	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2019-11-04	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2019-09-18	Junio C Hamano	Merge branch 'master' of https://github.com/prati0100...	blob \| commitdiff \| raw \| diff to current
2019-09-17	Junio C Hamano	Merge gitk to pick up emergency build fix	blob \| commitdiff \| raw \| diff to current
2019-09-16	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2019-08-07	Junio C Hamano	Merge branch 'py/call-do-quit-before-exit' of github...	blob \| commitdiff \| raw \| diff to current
2019-03-18	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw \| diff to current
2019-02-05	Junio C Hamano	Merge branch 'cc/test-ref-store-typofix'	blob \| commitdiff \| raw \| diff to current
2018-11-21	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw \| diff to current
2018-10-31	Junio C Hamano	Adjust for 2.19.x series	blob \| commitdiff \| raw \| diff to current
2018-10-16	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'sg/t7501-thinkofix'	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'sg/t0020-conversion-fix'	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'sg/t4051-fix'	blob \| commitdiff \| raw \| diff to current
2018-08-27	Junio C Hamano	Merge branch 'js/larger-timestamps'	blob \| commitdiff \| raw \| diff to current
2018-08-20	Junio C Hamano	Merge branch 'sb/pull-rebase-submodule'	blob \| commitdiff \| raw \| diff to current
2018-08-20	Junio C Hamano	Merge branch 'js/typofixes'	blob \| commitdiff \| raw \| diff to current
2018-08-15	Junio C Hamano	Merge branch 'sb/histogram-less-memory'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom