Commits

Breadcrumbs

History for

onmaintenance-inception

User selector

All users

Datepicker

All time

Commit history

Commits on Jun 6, 2025

• doc: update references to renamed AsciiDoc files

  Show description for 3717a57
  

  joukewitteveen

  authored and

  gitster

  committed
  3717a57View commit details

  Copy full SHA for 3717a57

  View code at this pointBrowse repository at this point

Commits on Apr 8, 2025

• Merge branch 'fr/vimdiff-layout-fixes'

  Show description for 09977c5
  gitster

  committed
  09977c5View commit details

  Copy full SHA for 09977c5

  View code at this pointBrowse repository at this point

Commits on Mar 25, 2025

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

  Show description for 93bab2d
  

  greenfoo

  authored and

  gitster

  committed
  93bab2dView commit details

  Copy full SHA for 93bab2d

  View code at this pointBrowse repository at this point

• mergetools: vimdiff: fix layout where REMOTE is the target

  Show description for e2d7419
  

  greenfoo

  authored and

  gitster

  committed
  e2d7419View commit details

  Copy full SHA for e2d7419

  View code at this pointBrowse repository at this point

Commits on Oct 3, 2024

• mergetool: fix a typo

  Show description for 2c1070c
  

  algonell

  authored and

  gitster

  committed
  2c1070cView commit details

  Copy full SHA for 2c1070c

  View code at this pointBrowse repository at this point

Commits on May 17, 2024

• Switch grep from non-portable BRE to portable ERE

  Show description for 0f063b6
  

  mtelka

  authored and

  gitster

  committed
  0f063b6View commit details

  Copy full SHA for 0f063b6

  View code at this pointBrowse repository at this point

Commits on Apr 26, 2024

• vimdiff: make script and tests work with zsh

  Show description for fedd5c7
  

  bk2204

  authored and

  gitster

  committed
  fedd5c7View commit details

  Copy full SHA for fedd5c7

  View code at this pointBrowse repository at this point

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
  b21d164View commit details

  Copy full SHA for b21d164

  View code at this pointBrowse repository at this point

Commits on Aug 10, 2022

• mergetools: vimdiff: simplify tabfirst

  Show description for 34133d9
  

  Felipe Contreras

  authored and

  gitster

  committed
  34133d9View commit details

  Copy full SHA for 34133d9

  View code at this pointBrowse repository at this point

• mergetools: vimdiff: fix single window layouts

  Show description for b6014ee
  

  Felipe Contreras

  authored and

  gitster

  committed
  b6014eeView commit details

  Copy full SHA for b6014ee

  View code at this pointBrowse repository at this point

• mergetools: vimdiff: rework tab logic

  Show description for ffcc33f
  

  Felipe Contreras

  authored and

  gitster

  committed
  ffcc33fView commit details

  Copy full SHA for ffcc33f

  View code at this pointBrowse repository at this point

• mergetools: vimdiff: fix for diffopt

  Show description for 60184ab
  

  Felipe Contreras

  authored and

  gitster

  committed
  60184abView commit details

  Copy full SHA for 60184ab

  View code at this pointBrowse repository at this point

• mergetools: vimdiff: silence annoying messages

  Show description for 66dd83a
  

  Felipe Contreras

  authored and

  gitster

  committed
  66dd83aView commit details

  Copy full SHA for 66dd83a

  View code at this pointBrowse repository at this point

• mergetools: vimdiff: make vimdiff3 actually work

  Show description for 79db50d
  

  Felipe Contreras

  authored and

  gitster

  committed
  79db50dView commit details

  Copy full SHA for 79db50d

  View code at this pointBrowse repository at this point

• mergetools: vimdiff: fix comment

  Show description for d619183
  

  Felipe Contreras

  authored and

  gitster

  committed
  d619183View commit details

  Copy full SHA for d619183

  View code at this pointBrowse repository at this point

Commits on Jul 27, 2022

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

  Show description for 0263e6b
  gitster

  committed
  0263e6bView commit details

  Copy full SHA for 0263e6b

  View code at this pointBrowse repository at this point

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

  Show description for 57fe0df
  gitster

  committed
  57fe0dfView commit details

  Copy full SHA for 57fe0df

  View code at this pointBrowse repository at this point

Commits on Jul 14, 2022

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

  Show description for ccc7b51
  

  dscho

  authored and

  gitster

  committed
  ccc7b51View commit details

  Copy full SHA for ccc7b51

  View code at this pointBrowse repository at this point

Commits on Jul 8, 2022

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

  Show description for f3d7623
  

  greenfoo

  authored and

  gitster

  committed
  f3d7623View commit details

  Copy full SHA for f3d7623

  View code at this pointBrowse repository at this point

Commits on Apr 3, 2022

• vimdiff: add tool documentation

  Show description for 7b5cf8b
  

  greenfoo

  authored and

  gitster

  committed
  7b5cf8bView commit details

  Copy full SHA for 7b5cf8b

  View code at this pointBrowse repository at this point

Commits on Mar 30, 2022

• vimdiff: new implementation with layout support

  Show description for 0041797
  

  greenfoo

  authored and

  gitster

  committed
  0041797View commit details

  Copy full SHA for 0041797

  View code at this pointBrowse repository at this point

Commits on Feb 23, 2021

• mergetools/vimdiff: add vimdiff1 merge tool variant

  Show description for 30bb808
  

  whiteinge

  authored and

  gitster

  committed
  30bb808View commit details

  Copy full SHA for 30bb808

  View code at this pointBrowse repository at this point

Commits on Jul 29, 2020

• mergetools: add support for nvimdiff (neovim) family

  Show description for 1186897
  

  pudiva

  authored and

  gitster

  committed
  1186897View commit details

  Copy full SHA for 1186897

  View code at this pointBrowse repository at this point

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

  Show description for 83bbf9b
  

  pudiva

  authored and

  gitster

  committed
  83bbf9bView commit details

  Copy full SHA for 83bbf9b

  View code at this pointBrowse repository at this point

Commits on Nov 29, 2016

• mergetools/vimdiff: trust Vim's exit code

  Show description for 2967284
  

  davvid

  authored and

  gitster

  committed
  2967284View commit details

  Copy full SHA for 2967284

  View code at this pointBrowse repository at this point

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

  Show description for 7c10605
  

  davvid

  authored and

  gitster

  committed
  7c10605View commit details

  Copy full SHA for 7c10605

  View code at this pointBrowse repository at this point

Commits on Feb 12, 2016

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

  Show description for 2300328
  

  diwo

  authored and

  gitster

  committed
  2300328View commit details

  Copy full SHA for 2300328

  View code at this pointBrowse repository at this point

Commits on Apr 22, 2014

• mergetools: add vimdiff3 mode

  Show description for 7c147b7
  

  Felipe Contreras

  authored and

  gitster

  committed
  7c147b7View commit details

  Copy full SHA for 7c147b7

  View code at this pointBrowse repository at this point

Commits on Jan 29, 2013

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

  Show description for 073678b
  

  davvid

  authored and

  gitster

  committed
  073678bView commit details

  Copy full SHA for 073678b

  View code at this pointBrowse repository at this point

Loading