Commits

Breadcrumbs

History for

onnext

User selector

All users

All time

Commit History

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