Commits

Breadcrumbs

History for

onmaster

User selector

All users

All time

Commit history

Commits on Feb 19, 2024

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

  Show description for b21d164
  

  kiprasmel

  authored and

  gitster

  committed
  b21d164

  Copy full SHA for b21d164

Commits on Aug 10, 2022

• mergetools: vimdiff: simplify tabfirst

  Show description for 34133d9
  

  felipec

  authored and

  gitster

  committed
  34133d9

  Copy full SHA for 34133d9

• mergetools: vimdiff: fix single window layouts

  Show description for b6014ee
  

  felipec

  authored and

  gitster

  committed
  b6014ee

  Copy full SHA for b6014ee

• mergetools: vimdiff: rework tab logic

  Show description for ffcc33f
  

  felipec

  authored and

  gitster

  committed
  ffcc33f

  Copy full SHA for ffcc33f

• mergetools: vimdiff: fix for diffopt

  Show description for 60184ab
  

  felipec

  authored and

  gitster

  committed
  60184ab

  Copy full SHA for 60184ab

• mergetools: vimdiff: silence annoying messages

  Show description for 66dd83a
  

  felipec

  authored and

  gitster

  committed
  66dd83a

  Copy full SHA for 66dd83a

• mergetools: vimdiff: make vimdiff3 actually work

  Show description for 79db50d
  

  felipec

  authored and

  gitster

  committed
  79db50d

  Copy full SHA for 79db50d

• mergetools: vimdiff: fix comment

  Show description for d619183
  

  felipec

  authored and

  gitster

  committed
  d619183

  Copy full SHA for d619183

Commits on Jul 27, 2022

• Merge branch 'fr/vimdiff-layout-fix' into maint

  Show description for 0263e6b
  gitster

  committed
  0263e6b

  Copy full SHA for 0263e6b

• Merge branch 'js/vimdiff-quotepath-fix' into maint

  Show description for 57fe0df
  gitster

  committed
  57fe0df

  Copy full SHA for 57fe0df

Commits on Jul 14, 2022

• mergetool(vimdiff): allow paths to contain spaces again

  Show description for ccc7b51
  

  dscho

  authored and

  gitster

  committed
  ccc7b51

  Copy full SHA for ccc7b51

Commits on Jul 8, 2022

• vimdiff: make layout engine more robust against user vim settings

  Show description for f3d7623
  

  greenfoo

  authored and

  gitster

  committed
  f3d7623

  Copy full SHA for f3d7623

Commits on Apr 3, 2022

• vimdiff: add tool documentation

  Show description for 7b5cf8b
  

  greenfoo

  authored and

  gitster

  committed
  7b5cf8b

  Copy full SHA for 7b5cf8b

Commits on Mar 30, 2022

• vimdiff: new implementation with layout support

  Show description for 0041797
  

  greenfoo

  authored and

  gitster

  committed
  0041797

  Copy full SHA for 0041797

Commits on Feb 23, 2021

• mergetools/vimdiff: add vimdiff1 merge tool variant

  Show description for 30bb808
  

  whiteinge

  authored and

  gitster

  committed
  30bb808

  Copy full SHA for 30bb808

Commits on Jul 29, 2020

• mergetools: add support for nvimdiff (neovim) family

  Show description for 1186897
  

  pudiva

  authored and

  gitster

  committed
  1186897

  Copy full SHA for 1186897

• mergetool--lib: improve support for vimdiff-style tool variants

  Show description for 83bbf9b
  

  pudiva

  authored and

  gitster

  committed
  83bbf9b

  Copy full SHA for 83bbf9b

Commits on Nov 29, 2016

• mergetools/vimdiff: trust Vim's exit code

  Show description for 2967284
  

  davvid

  authored and

  gitster

  committed
  2967284

  Copy full SHA for 2967284

• mergetool: honor mergetool.$tool.trustExitCode for built-in tools

  Show description for 7c10605
  

  davvid

  authored and

  gitster

  committed
  7c10605

  Copy full SHA for 7c10605

Commits on Feb 12, 2016

• mergetool: reorder vim/gvim buffers in three-way diffs

  Show description for 2300328
  

  diwo

  authored and

  gitster

  committed
  2300328

  Copy full SHA for 2300328

Commits on Apr 22, 2014

• mergetools: add vimdiff3 mode

  Show description for 7c147b7
  

  felipec

  authored and

  gitster

  committed
  7c147b7

  Copy full SHA for 7c147b7

Commits on Jan 29, 2013

• mergetools: simplify how we handle "vim" and "defaults"

  Show description for 073678b
  

  davvid

  authored and

  gitster

  committed
  073678b

  Copy full SHA for 073678b

Loading