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

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

projects / thirdparty / git.git / history

[thirdparty/git.git] / git-merge-one-file.sh

2023-09-18	Junio C Hamano	Merge git-gui into ml/git-gui-exec-path-fix	blob \| commitdiff \| raw
2023-08-24	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2023-05-08	Junio C Hamano	Merge gitk changes into js/gitk-fixes-from-gfw	blob \| commitdiff \| raw
2023-04-04	Junio C Hamano	Merge branch 'ob/rollback-after-commit-lock-failure'	blob \| commitdiff \| raw
2022-05-11	Junio C Hamano	Merge branch 'master' of git://git.ozlabs.org/~paulus...	blob \| commitdiff \| raw
2021-11-04	Junio C Hamano	Merge branch 'vd/pthread-setspecific-g11-fix' into...	blob \| commitdiff \| raw
2021-11-04	Junio C Hamano	Merge branch 'vd/pthread-setspecific-g11-fix'	blob \| commitdiff \| raw
2021-07-22	Junio C Hamano	Merge branch 'jk/typofix'	blob \| commitdiff \| raw
2021-07-17	Junio C Hamano	Merge branch 'ar/submodule-helper-include-cleanup'	blob \| commitdiff \| raw
2021-03-04	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2021-03-01	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2021-02-12	Johannes Schindelin	Sync with 2.17.6	blob \| commitdiff \| raw
2020-12-18	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2020-10-17	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2020-10-03	Junio C Hamano	Merge remote-tracking branch 'paulus/master' into pm...	blob \| commitdiff \| raw
2020-07-31	Junio C Hamano	Merge branch 'jb/doc-packfile-name' into master	blob \| commitdiff \| raw
2020-07-20	Junio C Hamano	Merge https://github.com/prati0100/git-gui into master	blob \| commitdiff \| raw
2020-06-09	Junio C Hamano	Merge branch 'vs/complete-stash-show-p-fix'	blob \| commitdiff \| raw
2020-05-21	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2020-05-08	Junio C Hamano	Merge branch 'cb/credential-store-ignore-bogus-lines'	blob \| commitdiff \| raw
2020-05-05	Junio C Hamano	Merge branch 'js/partial-urlmatch-2.17'	blob \| commitdiff \| raw
2020-04-29	Junio C Hamano	Sync with js/partial-urlmatch-2.17	blob \| commitdiff \| raw
2020-04-22	Junio C Hamano	Merge branch 'dl/wrapper-fix-indentation'	blob \| commitdiff \| raw
2020-04-19	Jonathan Nieder	Git 2.18.4 v2.18.4	blob \| commitdiff \| raw
2020-03-19	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2020-03-17	Junio C Hamano	Git 2.18.3 v2.18.3	blob \| commitdiff \| raw
2020-01-08	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2019-12-06	Johannes Schindelin	Sync with 2.17.3	blob \| commitdiff \| raw
2019-11-04	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw
2019-09-18	Junio C Hamano	Merge branch 'master' of https://github.com/prati0100...	blob \| commitdiff \| raw
2019-09-17	Junio C Hamano	Merge gitk to pick up emergency build fix	blob \| commitdiff \| raw
2019-09-16	Junio C Hamano	Merge branch 'master' of git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2019-08-07	Junio C Hamano	Merge branch 'py/call-do-quit-before-exit' of github...	blob \| commitdiff \| raw
2019-07-29	Junio C Hamano	Merge branch 'pw/add-p-recount' into maint	blob \| commitdiff \| raw
2019-07-09	Junio C Hamano	Merge branch 'pw/add-p-recount'	blob \| commitdiff \| raw
2019-03-18	Junio C Hamano	Merge git://ozlabs.org/~paulus/gitk	blob \| commitdiff \| raw
2019-03-11	Junio C Hamano	Merge branch 'js/rebase-recreate-merge'	blob \| commitdiff \| raw
2019-02-14	Junio C Hamano	Merge branch 'jc/no-grepping-for-strerror-in-tests'	blob \| commitdiff \| raw
2019-02-05	Junio C Hamano	Merge branch 'cc/test-ref-store-typofix'	blob \| commitdiff \| raw
2019-01-29	Junio C Hamano	Merge branch 'cc/partial-clone-doc-typofix'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'md/exclude-promisor-objects-fix-cleanup'	blob \| commitdiff \| raw
2019-01-14	Junio C Hamano	Merge branch 'hb/t0061-dot-in-path-fix'	blob \| commitdiff \| raw
2019-01-03	Junio C Hamano	Merge branch 'sg/test-bash-version-fix'	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'tb/char-may-be-unsigned' into maint	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'nd/packobjectshook-doc-fix' into maint	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'tq/refs-internal-comment-fix' into maint	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'bw/protocol-v2' into maint	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'sg/t3701-tighten-trace' into maint	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'ts/doc-build-manpage-xsl-quietly' into...	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'md/exclude-promisor-objects-fix' into...	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'js/diff-notice-has-drive-prefix' into...	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'np/log-graph-octopus-fix' into maint	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'sm/show-superproject-while-conflicted...	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'nd/attr-pathspec-fix' into maint	blob \| commitdiff \| raw
2018-11-21	Junio C Hamano	Merge branch 'en/rerere-multi-stage-1-fix' into maint	blob \| commitdiff \| raw
2018-11-13	Junio C Hamano	Merge branch 'ag/rev-parse-all-exclude-fix'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'tb/char-may-be-unsigned'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'md/exclude-promisor-objects-fix'	blob \| commitdiff \| raw
2018-11-06	Junio C Hamano	Merge branch 'nd/completion-negation'	blob \| commitdiff \| raw
2018-10-31	Junio C Hamano	Adjust for 2.19.x series	blob \| commitdiff \| raw
2018-10-30	Junio C Hamano	Merge branch 'js/diff-notice-has-drive-prefix'	blob \| commitdiff \| raw
2018-10-26	Junio C Hamano	Merge branch 'np/log-graph-octopus-fix'	blob \| commitdiff \| raw
2018-10-25	Junio C Hamano	t0061: adjust to test-tool transition	blob \| commitdiff \| raw
2018-10-19	Junio C Hamano	Merge branch 'sm/show-superproject-while-conflicted'	blob \| commitdiff \| raw
2018-10-16	Junio C Hamano	Merge branch 'nd/packobjectshook-doc-fix'	blob \| commitdiff \| raw
2018-10-16	Junio C Hamano	Merge branch 'jk/check-everything-connected-is-long...	blob \| commitdiff \| raw
2018-10-16	Junio C Hamano	Merge branch 'tq/refs-internal-comment-fix'	blob \| commitdiff \| raw
2018-09-27	Junio C Hamano	Sync with 2.17.2	blob \| commitdiff \| raw
2018-09-24	Junio C Hamano	Merge branch 'nd/attr-pathspec-fix'	blob \| commitdiff \| raw
2018-09-24	Junio C Hamano	Merge branch 'bw/protocol-v2'	blob \| commitdiff \| raw
2018-09-24	Junio C Hamano	Merge branch 'sg/t3701-tighten-trace'	blob \| commitdiff \| raw
2018-09-24	Junio C Hamano	Merge branch 'sb/diff-color-move-more'	blob \| commitdiff \| raw
2018-09-24	Junio C Hamano	Merge branch 'en/rerere-multi-stage-1-fix'	blob \| commitdiff \| raw
2018-09-17	Junio C Hamano	Merge branch 'ts/doc-build-manpage-xsl-quietly'	blob \| commitdiff \| raw
2018-09-04	Junio C Hamano	Merge branch 'ds/commit-graph-lockfile-fix'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'sg/t7501-thinkofix'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'sg/t0020-conversion-fix'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'sg/t4051-fix'	blob \| commitdiff \| raw
2018-08-27	Junio C Hamano	Merge branch 'js/larger-timestamps'	blob \| commitdiff \| raw
2018-08-22	Junio C Hamano	Merge branch 'nd/pack-deltify-regression-fix'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'nd/cherry-pick-quit-fix'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'pw/rebase-i-squash-number-fix'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'sb/config-write-fix'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'jh/partial-clone-doc'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'sb/pull-rebase-submodule'	blob \| commitdiff \| raw
2018-08-20	Junio C Hamano	Merge branch 'js/typofixes'	blob \| commitdiff \| raw
2018-08-17	Junio C Hamano	Merge branch 'nd/complete-config-vars'	blob \| commitdiff \| raw
2018-08-17	Junio C Hamano	Merge branch 'ar/t4150-am-scissors-test-fix'	blob \| commitdiff \| raw
2018-08-17	Junio C Hamano	Merge branch 'en/t3031-title-fix'	blob \| commitdiff \| raw
2018-08-17	Junio C Hamano	Merge branch 'rs/parse-opt-lithelp'	blob \| commitdiff \| raw
2018-08-17	Junio C Hamano	Merge branch 'jt/refspec-dwim-precedence-fix'	blob \| commitdiff \| raw
2018-08-17	Junio C Hamano	Merge branch 'jk/merge-subtree-heuristics'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'sb/histogram-less-memory'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'es/diff-color-moved-fix'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'bw/protocol-v2'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'sg/fast-import-dump-refs-on-checkpoint...	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'sb/trailers-docfix'	blob \| commitdiff \| raw
2018-08-15	Junio C Hamano	Merge branch 'jk/ui-color-always-to-auto'	blob \| commitdiff \| raw
2018-08-02	Junio C Hamano	Merge branch 'bc/sequencer-export-work-tree-as-well'	blob \| commitdiff \| raw
next

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

RSS Atom