git gui: add directly calling merge tool from configuration

Tobias Boesch committed almost 2 years ago

Sync with Git 2.46.1

Junio C Hamano committed almost 2 years ago

The sixteenth batch

Junio C Hamano committed almost 2 years ago

Merge branch 'bl/trailers-and-incomplete-last-line-fix'

Junio C Hamano committed almost 2 years ago

Merge branch 'rj/cygwin-has-dev-tty'

Junio C Hamano committed almost 2 years ago

Merge branch 'rs/diff-exit-code-fix'

Junio C Hamano committed almost 2 years ago

Merge branch 'jc/doc-skip-fetch-all-and-prefetch'

Junio C Hamano committed almost 2 years ago

Merge branch 'ds/doc-wholesale-disabling-advice-messages'

Junio C Hamano committed almost 2 years ago

Merge branch 'jk/sparse-fdleak-fix'

Junio C Hamano committed almost 2 years ago

Merge branch 'ds/scalar-no-tags'

Junio C Hamano committed almost 2 years ago

Git 2.46.1

Junio C Hamano committed almost 2 years ago

Merge branch 'rj/compat-terminal-unused-fix' into maint-2.46

Junio C Hamano committed almost 2 years ago

Merge branch 'jc/config-doc-update' into maint-2.46

Junio C Hamano committed almost 2 years ago

Merge branch 'aa/cat-file-batch-output-doc' into maint-2.46

Junio C Hamano committed almost 2 years ago

Merge branch 'cl/config-regexp-docfix' into maint-2.46

Junio C Hamano committed almost 2 years ago

← Newer Page 353 of 4093 Older →