git.ipfire.org Git - thirdparty/git.git/history - t/t3310-notes-merge-manual-resolve.sh

]> git.ipfire.org Git - thirdparty/git.git/history - t/t3310-notes-merge-manual-resolve.sh

projects / thirdparty / git.git / history

[thirdparty/git.git] / t / t3310-notes-merge-manual-resolve.sh

2024-02-09	Junio C Hamano	Merge branch 'mk/doc-gitfile-more' into maint-2.43	blob \| commitdiff \| raw
2024-02-09	Junio C Hamano	Merge branch 'ps/ref-tests-update-more' into maint...	blob \| commitdiff \| raw
2024-02-09	Junio C Hamano	Merge branch 'rs/column-leakfix' into maint-2.43	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'jb/reflog-expire-delete-dry-run-options...	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'js/packfile-h-typofix' into maint-2.43	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'jk/commit-graph-slab-clear-fix' into...	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'rj/status-bisect-while-rebase' into maint...	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'jx/fetch-atomic-error-message-fix' into...	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'jk/mailinfo-iterative-unquote-comment...	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'jk/bisect-reset-fix' into maint-2.43	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'jk/end-of-options' into maint-2.43	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'jc/revision-parse-int' into maint-2.43	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'jp/use-diff-index-in-pre-commit-sample...	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'jh/trace2-redact-auth' into maint-2.43	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'js/update-urls-in-doc-and-comment' into...	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'tz/send-email-negatable-options' into...	blob \| commitdiff \| raw \| diff to current
2024-02-09	Junio C Hamano	Merge branch 'js/ci-discard-prove-state' into maint...	blob \| commitdiff \| raw \| diff to current
2023-12-03	Patrick Steinhardt	t3310: stop checking for reference existence via `test -f`	blob \| commitdiff \| raw
2023-11-20	Junio C Hamano	Merge branch 'vd/glossary-dereference-peel'	blob \| commitdiff \| raw \| diff to current
2023-11-20	Junio C Hamano	Merge branch 'tz/send-email-helpfix'	blob \| commitdiff \| raw \| diff to current
2023-11-08	Junio C Hamano	Merge branch 'tb/rev-list-unpacked-fix'	blob \| commitdiff \| raw \| diff to current
2023-11-08	Junio C Hamano	Merge branch 'ps/leakfixes'	blob \| commitdiff \| raw \| diff to current
2023-11-08	Junio C Hamano	Merge branch 'jc/test-i18ngrep'	blob \| commitdiff \| raw \| diff to current
2023-11-02	Junio C Hamano	tests: teach callers of test_i18ngrep to use test_grep	blob \| commitdiff \| raw \| diff to current
2023-09-18	Junio C Hamano	Merge git-gui into ml/git-gui-exec-path-fix	blob \| commitdiff \| raw \| diff to current
2023-08-24	Junio C Hamano	Merge https://github.com/prati0100/git-gui	blob \| commitdiff \| raw \| diff to current
2023-05-08	Junio C Hamano	Merge gitk changes into js/gitk-fixes-from-gfw	blob \| commitdiff \| raw \| diff to current
2023-04-04	Junio C Hamano	Merge branch 'ob/rollback-after-commit-lock-failure'	blob \| commitdiff \| raw \| diff to current
2023-03-19	Junio C Hamano	Merge branch 'ew/commit-reach-clean-up-flags-fix'	blob \| commitdiff \| raw \| diff to current
2022-07-04	Junio C Hamano	Merge 'js/add-i-delete' into maint-2.37	blob \| commitdiff \| raw \| diff to current
2022-07-03	Junio C Hamano	Merge branch 'js/add-i-delete'	blob \| commitdiff \| raw \| diff to current
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-10-12	Junio C Hamano	Merge branch 'jk/apply-binary-hunk-parsing-fix' into...	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'es/walken-tutorial-fix' into maint	blob \| commitdiff \| raw \| diff to current
2021-10-12	Junio C Hamano	Merge branch 'cb/builtin-merge-format-string-fix' into...	blob \| commitdiff \| raw \| diff to current
2021-09-10	Junio C Hamano	Merge branch 'es/walken-tutorial-fix'	blob \| commitdiff \| raw \| diff to current
2021-08-30	Junio C Hamano	Merge branch 'jk/apply-binary-hunk-parsing-fix'	blob \| commitdiff \| raw \| diff to current
2021-08-30	Junio C Hamano	Merge branch 'cb/builtin-merge-format-string-fix'	blob \| commitdiff \| raw \| diff to current
2021-07-22	Junio C Hamano	Merge branch 'jk/typofix'	blob \| commitdiff \| raw \| diff to current
2021-07-17	Junio C Hamano	Merge branch 'ar/submodule-helper-include-cleanup'	blob \| commitdiff \| raw \| diff to current
2021-07-13	Junio C Hamano	Merge branch 'rs/grep-parser-fix'	blob \| commitdiff \| raw \| diff to current
2021-07-08	Junio C Hamano	Merge branch 'js/trace2-discard-event-docfix'	blob \| commitdiff \| raw \| diff to current
2021-06-14	Junio C Hamano	Merge branch 'ab/trace2-squelch-gcc-warning'	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
2021-02-12	Johannes Schindelin	Sync with 2.25.5	blob \| commitdiff \| raw \| diff to current
2021-02-12	Johannes Schindelin	Sync with 2.18.5	blob \| commitdiff \| raw \| diff to current
2021-02-06	Junio C Hamano	Merge branch 'jk/forbid-lf-in-git-url' into maint	blob \| commitdiff \| raw \| diff to current
2021-01-25	Junio C Hamano	Merge branch 'jk/forbid-lf-in-git-url'	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-12-17	Junio C Hamano	Merge branch 'jh/index-v2-doc-on-fsmn'	blob \| commitdiff \| raw \| diff to current
2020-12-17	Junio C Hamano	Merge branch 'jb/midx-doc-update'	blob \| commitdiff \| raw \| diff to current
2020-12-14	Junio C Hamano	Merge branch 'jk/multi-line-indent-style-fix'	blob \| commitdiff \| raw \| diff to current
2020-12-08	Junio C Hamano	Merge branch 'sn/config-doc-typofix'	blob \| commitdiff \| raw \| diff to current
2020-12-08	Junio C Hamano	Merge branch 'tb/idx-midx-race-fix'	blob \| commitdiff \| raw \| diff to current
2020-11-30	Junio C Hamano	Merge branch 'km/stash-error-message-fix'	blob \| commitdiff \| raw \| diff to current
2020-11-30	Junio C Hamano	Merge branch 'na/notes-displayref-is-not-boolean'	blob \| commitdiff \| raw \| diff to current
2020-11-30	Junio C Hamano	Merge branch 'ab/gc-keep-base-option'	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-04	Junio C Hamano	Merge branch 'cc/bisect-start-fix'	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-08-31	Junio C Hamano	Merge branch 'rs/checkout-no-overlay-pathspec-fix'	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-30	Junio C Hamano	Merge branch 'en/fill-directory-exponential' 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-07-07	Junio C Hamano	Merge branch 'mk/pb-pretty-email-without-domain-part...	blob \| commitdiff \| raw \| diff to current
2020-06-29	Junio C Hamano	Merge branch 'rs/retire-strbuf-write-fd'	blob \| commitdiff \| raw \| diff to current
2020-06-18	Junio C Hamano	Merge branch 'js/fuzz-commit-graph-leakfix'	blob \| commitdiff \| raw \| diff to current
2020-06-18	Junio C Hamano	Merge branch 'en/do-match-pathspec-fix'	blob \| commitdiff \| raw \| diff to current
2020-06-09	Junio C Hamano	Merge branch 'cb/bisect-helper-parser-fix'	blob \| commitdiff \| raw \| diff to current
2020-06-09	Junio C Hamano	Merge branch 'js/checkout-p-new-file'	blob \| commitdiff \| raw \| diff to current
2020-06-09	Junio C Hamano	Merge branch 'vs/complete-stash-show-p-fix'	blob \| commitdiff \| raw \| diff to current
2020-06-09	Junio C Hamano	Merge branch 'rs/fsck-duplicate-names-in-trees'	blob \| commitdiff \| raw \| diff to current
2020-06-09	Junio C Hamano	Merge branch 'es/bugreport-shell'	blob \| commitdiff \| raw \| diff to current
2020-05-25	Junio C Hamano	Merge branch 'ds/multi-pack-verify'	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-05-20	Junio C Hamano	Merge branch 'es/bugreport'	blob \| commitdiff \| raw \| diff to current
2020-05-20	Junio C Hamano	Merge branch 'cb/no-more-gmtime'	blob \| commitdiff \| raw \| diff to current
2020-05-14	Junio C Hamano	Merge branch 'jt/t5500-unflake'	blob \| commitdiff \| raw \| diff to current
2020-05-14	Junio C Hamano	Merge branch 'rs/fsck-duplicate-names-in-trees'	blob \| commitdiff \| raw \| diff to current
2020-05-14	Junio C Hamano	Merge branch 'js/rebase-autosquash-double-fixup-fix'	blob \| commitdiff \| raw \| diff to current
2020-05-14	Junio C Hamano	Merge branch 'es/bugreport-with-hooks'	blob \| commitdiff \| raw \| diff to current
2020-05-08	Junio C Hamano	Merge branch 'cb/t0000-use-the-configured-shell'	blob \| commitdiff \| raw \| diff to current
2020-05-08	Junio C Hamano	Merge branch 'cb/avoid-colliding-with-netbsd-hmac'	blob \| commitdiff \| raw \| diff to current
2020-05-08	Junio C Hamano	Merge branch 'jk/for-each-ref-multi-key-sort-fix'	blob \| commitdiff \| raw \| diff to current
2020-05-08	Junio C Hamano	Merge branch 'cb/credential-store-ignore-bogus-lines'	blob \| commitdiff \| raw \| diff to current
2020-05-08	Junio C Hamano	Merge branch 'dl/switch-c-option-in-error-message'	blob \| commitdiff \| raw \| diff to current
2020-05-05	Junio C Hamano	Merge branch 'js/partial-urlmatch-2.17'	blob \| commitdiff \| raw \| diff to current
2020-05-05	Junio C Hamano	Merge branch 'bc/wildcard-credential'	blob \| commitdiff \| raw \| diff to current
2020-05-01	Junio C Hamano	Merge branch 'jt/v2-fetch-nego-fix'	blob \| commitdiff \| raw \| diff to current
2020-05-01	Junio C Hamano	Merge branch 'js/anonymise-push-url-in-errors'	blob \| commitdiff \| raw \| diff to current
2020-05-01	Junio C Hamano	Merge branch 'es/bugreport'	blob \| commitdiff \| raw \| diff to current
2020-05-01	Junio C Hamano	Merge branch 'ds/multi-pack-index'	blob \| commitdiff \| raw \| diff to current
2020-05-01	Junio C Hamano	Merge branch 'tb/commit-graph-fd-exhaustion-fix'	blob \| commitdiff \| raw \| diff to current
2020-05-01	Junio C Hamano	Merge branch 'tb/commit-graph-split-strategy'	blob \| commitdiff \| raw \| diff to current
2020-04-29	Junio C Hamano	Merge branch 'en/fill-directory-exponential'	blob \| commitdiff \| raw \| diff to current
2020-04-29	Junio C Hamano	Sync with js/partial-urlmatch-2.17	blob \| commitdiff \| raw \| diff to current
2020-04-28	Junio C Hamano	Merge branch 'jn/demote-proto2-from-default'	blob \| commitdiff \| raw \| diff to current
next

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

RSS Atom