Commits

History for

Commits on Jun 6, 2025

doc: update references to renamed AsciiDoc files

joukewitteveen
authored and
gitster
committed
3717a57

Commits on Apr 8, 2025

Merge branch 'fr/vimdiff-layout-fixes'
gitster
committed
09977c5

Commits on Mar 25, 2025

mergetools: vimdiff: add tests for layout with REMOTE as the target

greenfoo
authored and
gitster
committed
93bab2d
mergetools: vimdiff: fix layout where REMOTE is the target

greenfoo
authored and
gitster
committed
e2d7419

Commits on Oct 4, 2024

Merge branch 'ak/typofix-2.46-maint'
gitster
committed
4861bbf

Commits on Oct 3, 2024

mergetool: fix a typo

algonell
authored and
gitster
committed
2c1070c

Commits on Sep 2, 2024

mergetools: vscode: new tool

alexhenrie
authored and
gitster
committed
6b77283

Commits on May 17, 2024

Switch grep from non-portable BRE to portable ERE

mtelka
authored and
gitster
committed
0f063b6

Commits on Apr 26, 2024

vimdiff: make script and tests work with zsh

bk2204
authored and
gitster
committed
fedd5c7

Commits on Feb 19, 2024

mergetools: vimdiff: use correct tool's name when reading mergetool config

kiprasmel
authored and
gitster
committed
b21d164

Commits on Aug 10, 2022

mergetools: vimdiff: simplify tabfirst

felipec
authored and
gitster
committed
34133d9
mergetools: vimdiff: fix single window layouts

felipec
authored and
gitster
committed
b6014ee
mergetools: vimdiff: rework tab logic

felipec
authored and
gitster
committed
ffcc33f
mergetools: vimdiff: fix for diffopt

felipec
authored and
gitster
committed
60184ab
mergetools: vimdiff: silence annoying messages

felipec
authored and
gitster
committed
66dd83a
mergetools: vimdiff: make vimdiff3 actually work

felipec
authored and
gitster
committed
79db50d
mergetools: vimdiff: fix comment

felipec
authored and
gitster
committed
d619183

Commits on Jul 27, 2022

Merge branch 'fr/vimdiff-layout-fix' into maint
gitster
committed
0263e6b
Merge branch 'js/vimdiff-quotepath-fix' into maint
gitster
committed
57fe0df

Commits on Jul 14, 2022

mergetool(vimdiff): allow paths to contain spaces again

dscho
authored and
gitster
committed
ccc7b51

Commits on Jul 8, 2022

vimdiff: make layout engine more robust against user vim settings

greenfoo
authored and
gitster
committed
f3d7623

Commits on Apr 3, 2022

mergetools: add description to all diff/merge tools

greenfoo
authored and
gitster
committed
980145f
vimdiff: add tool documentation

greenfoo
authored and
gitster
committed
7b5cf8b

Commits on Mar 30, 2022

vimdiff: new implementation with layout support

greenfoo
authored and
gitster
committed
0041797

Commits on Oct 13, 2021

mergetools/xxdiff: prevent segfaults from stopping difftool

davvid
authored and
gitster
committed
571f434

Commits on Jun 8, 2021

mergetools/kdiff3: make kdiff3 work on Windows too

michaelcompressconsult
authored and
gitster
committed
47eb4c6

Commits on Feb 23, 2021

mergetools/vimdiff: add vimdiff1 merge tool variant

whiteinge
authored and
gitster
committed
30bb808

Commits on Nov 21, 2020

Merge branch 'pd/mergetool-nvimdiff'
gitster
committed
d203add

Commits on Nov 11, 2020

mergetools/bc: add `bc4` to the alias list for Beyond Compare

dscho
authored and
gitster
committed
6bc9082

Commits on Sep 22, 2020

Merge branch 'ls/mergetool-meld-auto-merge'
gitster
committed
4aff18a

Commits on Sep 17, 2020

mergetool: allow auto-merge for meld to follow the vim-diff behavior

Lin Sun
authored and
gitster
committed
dbd8c09

Commits on Jul 29, 2020

mergetools: add support for nvimdiff (neovim) family

pudiva
authored and
gitster
committed
1186897
mergetool--lib: improve support for vimdiff-style tool variants

pudiva
authored and
gitster
committed
83bbf9b

Commits on Apr 4, 2019

mergetools: add support for smerge (Sublime Merge)

davvid
authored and
gitster
committed
eb12adc

Commits on Apr 5, 2018

mergetools: add support for guiffy

britcher
authored and
gitster
committed
6ceb658