The sixteenth batch
[git/gitster.git] / git-merge-one-file.sh
11 days ago Junio C HamanoMerge branch 'master' of https://github.com/j6t/git-gui
11 days ago Junio C HamanoMerge branch 'master' of https://github.com/j6t/gitk
2025-06-06 Junio C HamanoMerge branch 'master' of https://github.com/j6t/git-gui
2025-05-29 Junio C HamanoMerge branch 'master' of https://github.com/j6t/git-gui
2025-05-29 Junio C HamanoMerge branch 'master' of https://github.com/j6t/gitk
2025-05-23 Johannes SixtMerge branch 'js/fix-open-exec'
2025-05-23 Johannes SixtMerge branch 'ml/replace-auto-execok'
2025-05-23 Johannes SixtMerge branch 'js/fix-open-exec'
2025-05-23 Johannes SixtMerge branch 'ah/fix-open-with-stdin'
2025-05-09 Junio C HamanoMerge branch 'master' of https://github.com/j6t/gitk
2025-05-09 Junio C HamanoMerge branch 'master' of https://github.com/j6t/git-gui
2025-02-20 Junio C HamanoMerge branch 'master' of https://github.com/j6t/gitk
2025-01-06 Junio C HamanoMerge branch 'master' of https://github.com/j6t/gitk
2025-01-06 Junio C HamanoMerge branch 'master' of https://github.com/j6t/git-gui
2024-12-26 Junio C HamanoMerge https://github.com/j6t/git-gui
2024-12-18 Junio C HamanoMerge https://github.com/j6t/gitk
2024-11-25 Junio C HamanoMerge branch 'master' of https://github.com/j6t/gitk...
2024-11-11 Junio C HamanoMerge https://github.com/j6t/git-gui
2024-07-08 Junio C HamanoMerge https://github.com/j6t/git-gui
2023-09-18 Junio C HamanoMerge git-gui into ml/git-gui-exec-path-fix
2023-08-24 Junio C HamanoMerge https://github.com/prati0100/git-gui
2023-05-08 Junio C HamanoMerge gitk changes into js/gitk-fixes-from-gfw
2023-04-04 Junio C HamanoMerge branch 'ob/rollback-after-commit-lock-failure'
2022-05-11 Junio C HamanoMerge branch 'master' of git://git.ozlabs.org/~paulus...
2021-11-04 Junio C HamanoMerge branch 'vd/pthread-setspecific-g11-fix' into...
2021-11-04 Junio C HamanoMerge branch 'vd/pthread-setspecific-g11-fix'
2021-07-22 Junio C HamanoMerge branch 'jk/typofix'
2021-07-17 Junio C HamanoMerge branch 'ar/submodule-helper-include-cleanup'
2021-03-04 Junio C HamanoMerge https://github.com/prati0100/git-gui
2021-03-01 Junio C HamanoMerge https://github.com/prati0100/git-gui
2021-02-12 Johannes SchindelinSync with 2.17.6
2020-12-18 Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-10-17 Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-10-03 Junio C HamanoMerge remote-tracking branch 'paulus/master' into pm...
2020-07-31 Junio C HamanoMerge branch 'jb/doc-packfile-name' into master
2020-07-20 Junio C HamanoMerge https://github.com/prati0100/git-gui into master
2020-06-09 Junio C HamanoMerge branch 'vs/complete-stash-show-p-fix'
2020-05-21 Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-05-08 Junio C HamanoMerge branch 'cb/credential-store-ignore-bogus-lines'
2020-05-05 Junio C HamanoMerge branch 'js/partial-urlmatch-2.17'
2020-04-29 Junio C HamanoSync with js/partial-urlmatch-2.17
2020-04-22 Junio C HamanoMerge branch 'dl/wrapper-fix-indentation'
2020-04-19 Jonathan NiederGit 2.18.4v2.18.4
2020-03-19 Junio C HamanoMerge https://github.com/prati0100/git-gui
2020-03-17 Junio C HamanoGit 2.18.3v2.18.3
2020-01-08 Junio C HamanoMerge https://github.com/prati0100/git-gui
2019-12-06 Johannes SchindelinSync with 2.17.3
2019-11-04 Junio C HamanoMerge https://github.com/prati0100/git-gui
2019-09-18 Junio C HamanoMerge branch 'master' of https://github.com/prati0100...
2019-09-17 Junio C HamanoMerge gitk to pick up emergency build fix
2019-09-16 Junio C HamanoMerge branch 'master' of git://ozlabs.org/~paulus/gitk
2019-08-07 Junio C HamanoMerge branch 'py/call-do-quit-before-exit' of github...
2019-07-29 Junio C HamanoMerge branch 'pw/add-p-recount' into maint
2019-07-09 Junio C HamanoMerge branch 'pw/add-p-recount'
2019-03-18 Junio C HamanoMerge git://ozlabs.org/~paulus/gitk
2019-03-11 Junio C HamanoMerge branch 'js/rebase-recreate-merge'
2019-02-14 Junio C HamanoMerge branch 'jc/no-grepping-for-strerror-in-tests'
2019-02-05 Junio C HamanoMerge branch 'cc/test-ref-store-typofix'
2019-01-29 Junio C HamanoMerge branch 'cc/partial-clone-doc-typofix'
2019-01-14 Junio C HamanoMerge branch 'md/exclude-promisor-objects-fix-cleanup'
2019-01-14 Junio C HamanoMerge branch 'hb/t0061-dot-in-path-fix'
2019-01-03 Junio C HamanoMerge branch 'sg/test-bash-version-fix'
2018-11-21 Junio C HamanoMerge branch 'tb/char-may-be-unsigned' into maint
2018-11-21 Junio C HamanoMerge branch 'nd/packobjectshook-doc-fix' into maint
2018-11-21 Junio C HamanoMerge branch 'jk/check-everything-connected-is-long...
2018-11-21 Junio C HamanoMerge branch 'tq/refs-internal-comment-fix' into maint
2018-11-21 Junio C HamanoMerge branch 'bw/protocol-v2' into maint
2018-11-21 Junio C HamanoMerge branch 'sg/t3701-tighten-trace' into maint
2018-11-21 Junio C HamanoMerge branch 'ts/doc-build-manpage-xsl-quietly' into...
2018-11-21 Junio C HamanoMerge branch 'md/exclude-promisor-objects-fix' into...
2018-11-21 Junio C HamanoMerge branch 'js/diff-notice-has-drive-prefix' into...
2018-11-21 Junio C HamanoMerge branch 'np/log-graph-octopus-fix' into maint
2018-11-21 Junio C HamanoMerge branch 'sm/show-superproject-while-conflicted...
2018-11-21 Junio C HamanoMerge branch 'nd/attr-pathspec-fix' into maint
2018-11-21 Junio C HamanoMerge branch 'en/rerere-multi-stage-1-fix' into maint
2018-11-13 Junio C HamanoMerge branch 'ag/rev-parse-all-exclude-fix'
2018-11-06 Junio C HamanoMerge branch 'tb/char-may-be-unsigned'
2018-11-06 Junio C HamanoMerge branch 'md/exclude-promisor-objects-fix'
2018-11-06 Junio C HamanoMerge branch 'nd/completion-negation'
2018-10-31 Junio C HamanoAdjust for 2.19.x series
2018-10-30 Junio C HamanoMerge branch 'js/diff-notice-has-drive-prefix'
2018-10-26 Junio C HamanoMerge branch 'np/log-graph-octopus-fix'
2018-10-25 Junio C Hamanot0061: adjust to test-tool transition
2018-10-19 Junio C HamanoMerge branch 'sm/show-superproject-while-conflicted'
2018-10-16 Junio C HamanoMerge branch 'nd/packobjectshook-doc-fix'
2018-10-16 Junio C HamanoMerge branch 'jk/check-everything-connected-is-long...
2018-10-16 Junio C HamanoMerge branch 'tq/refs-internal-comment-fix'
2018-09-27 Junio C HamanoSync with 2.17.2
2018-09-24 Junio C HamanoMerge branch 'nd/attr-pathspec-fix'
2018-09-24 Junio C HamanoMerge branch 'bw/protocol-v2'
2018-09-24 Junio C HamanoMerge branch 'sg/t3701-tighten-trace'
2018-09-24 Junio C HamanoMerge branch 'sb/diff-color-move-more'
2018-09-24 Junio C HamanoMerge branch 'en/rerere-multi-stage-1-fix'
2018-09-17 Junio C HamanoMerge branch 'ts/doc-build-manpage-xsl-quietly'
2018-09-04 Junio C HamanoMerge branch 'ds/commit-graph-lockfile-fix'
2018-08-27 Junio C HamanoMerge branch 'sg/t7501-thinkofix'
2018-08-27 Junio C HamanoMerge branch 'sg/t0020-conversion-fix'
2018-08-27 Junio C HamanoMerge branch 'sg/t4051-fix'
2018-08-27 Junio C HamanoMerge branch 'js/larger-timestamps'
2018-08-22 Junio C HamanoMerge branch 'nd/pack-deltify-regression-fix'
next