Merge branch 'jk/output-prefix-cleanup' into maint-2.47

Junio C Hamano committed over 1 year ago

Merge branch 'sk/doc-maintenance-schedule' into maint-2.47

Junio C Hamano committed over 1 year ago

Merge branch 'tb/notes-amlog-doc' into maint-2.47

Junio C Hamano committed over 1 year ago

Merge branch 'master' of https://github.com/j6t/gitk into maint-2.47

Junio C Hamano committed over 1 year ago

git-difftool--helper.sh: exit upon initialize_merge_tool errors

Philippe Blain committed over 1 year ago

git-mergetool--lib.sh: add error message for unknown tool variant

Philippe Blain committed over 1 year ago

git-mergetool--lib.sh: add error message if 'setup_user_tool' fails

Philippe Blain committed over 1 year ago

git-mergetool--lib.sh: use TOOL_MODE when erroring about unknown tool

Philippe Blain committed over 1 year ago

completion: complete '--tool-help' in 'git mergetool'

Philippe Blain committed over 1 year ago

fetch set_head: handle mirrored bare repositories

Bence Ferdinandy committed over 1 year ago

fetch: set remote/HEAD if it does not exist

Bence Ferdinandy committed over 1 year ago

refs: add create_only option to refs_update_symref_extended

Bence Ferdinandy committed over 1 year ago

refs: add TRANSACTION_CREATE_EXISTS error

Bence Ferdinandy committed over 1 year ago

remote set-head: better output for --auto

Bence Ferdinandy committed over 1 year ago

remote set-head: refactor for readability

Bence Ferdinandy committed over 1 year ago

refs: atomically record overwritten ref in update_symref

Bence Ferdinandy committed over 1 year ago

refs: standardize output of refs_read_symbolic_ref

Bence Ferdinandy committed over 1 year ago

t/t5505-remote: test failure of set-head

Bence Ferdinandy committed over 1 year ago

t/t5505-remote: set default branch to main

Bence Ferdinandy committed over 1 year ago

gitk: check main window visibility before waiting for it to show

Tobias Pietzsch committed over 5 years ago