Commits

Breadcrumbs

History for

onmaster

User selector

All users

All time

Commit History

Commits on Oct 13, 2021

• mergetools/xxdiff: prevent segfaults from stopping difftool

  Show description for 571f434
  

  davvid

  authored and

  gitster

  committed
  571f434

  Copy full SHA for 571f434

Commits on Jun 8, 2021

• mergetools/kdiff3: make kdiff3 work on Windows too

  Show description for 47eb4c6
  

  michaelcompressconsult

  authored and

  gitster

  committed
  47eb4c6

  Copy full SHA for 47eb4c6

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 Nov 21, 2020

• Merge branch 'pd/mergetool-nvimdiff'

  Show description for d203add
  gitster

  committed
  d203add

  Copy full SHA for d203add

Commits on Nov 11, 2020

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

  Show description for 6bc9082
  

  dscho

  authored and

  gitster

  committed
  6bc9082

  Copy full SHA for 6bc9082

Commits on Sep 22, 2020

• Merge branch 'ls/mergetool-meld-auto-merge'

  Show description for 4aff18a
  gitster

  committed
  4aff18a

  Copy full SHA for 4aff18a

Commits on Sep 17, 2020

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

  Show description for dbd8c09
  

  Lin Sun

  authored and

  gitster

  committed
  dbd8c09

  Copy full SHA for dbd8c09

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 Apr 4, 2019

• mergetools: add support for smerge (Sublime Merge)

  Show description for eb12adc
  

  davvid

  authored and

  gitster

  committed
  eb12adc

  Copy full SHA for eb12adc

Commits on Apr 5, 2018

• mergetools: add support for guiffy

  Show description for 6ceb658
  

  britcher

  authored and

  gitster

  committed
  6ceb658

  Copy full SHA for 6ceb658

Commits on Jun 19, 2017

• mergetools/meld: improve compatibiilty with Meld on macOS X

  Show description for 0af85f8
  

  davvid

  authored and

  gitster

  committed
  0af85f8

  Copy full SHA for 0af85f8

Commits on Dec 19, 2016

• Merge branch 'da/mergetool-xxdiff-hotkey'

  Show description for a3c9887
  gitster

  committed
  a3c9887

  Copy full SHA for a3c9887

Commits on Dec 12, 2016

• mergetools: fix xxdiff hotkeys

  Show description for 6cf5f6c
  

  davvid

  authored and

  gitster

  committed
  6cf5f6c

  Copy full SHA for 6cf5f6c

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 Apr 4, 2016

• mergetools: add support for ExamDiff

  Show description for 35d62bb
  

  jacobnisnevich

  authored and

  gitster

  committed
  35d62bb

  Copy full SHA for 35d62bb

• mergetools: create mergetool_find_win32_cmd() helper function for winmerge

  Show description for e36d716
  

  jacobnisnevich

  authored and

  gitster

  committed
  e36d716

  Copy full SHA for e36d716

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 May 20, 2015

• mergetools: add winmerge as a builtin tool

  Show description for 3e4f237
  

  davvid

  authored and

  gitster

  committed
  3e4f237

  Copy full SHA for 3e4f237

Commits on Nov 21, 2014

• mergetools: stop setting $status in merge_cmd()

  Show description for 1e86d5b
  

  davvid

  authored and

  gitster

  committed
  1e86d5b

  Copy full SHA for 1e86d5b

Commits on Oct 29, 2014

• Merge branch 'oc/mergetools-beyondcompare'

  Show description for c1777a2
  gitster

  committed
  c1777a2

  Copy full SHA for c1777a2

Commits on Oct 21, 2014

• mergetool: rename bc3 to bc

  Show description for f13f9b0
  gitster

  committed
  f13f9b0

  Copy full SHA for f13f9b0

Commits on Oct 16, 2014

• mergetools/meld: make usage of `--output` configurable and more robust

  Show description for b12d045
  

  davvid

  authored and

  gitster

  committed
  b12d045

  Copy full SHA for b12d045

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 Oct 13, 2013

• mergetools/diffmerge: support DiffMerge as a git mergetool

  Show description for c5f424f
  

  Stefan Saasen

  authored and

  jrn

  committed
  c5f424f

  Copy full SHA for c5f424f

Commits on May 9, 2013

• Sync with v1.8.2.3

  Show description for b387c77
  gitster

  committed
  b387c77

  Copy full SHA for b387c77

• mergetools/kdiff3: do not use --auto when diffing

  Show description for e2161bc
  

  davvid

  authored and

  gitster

  committed
  e2161bc

  Copy full SHA for e2161bc

Commits on Mar 13, 2013

• mergetools/p4merge: create a base if none available

  Show description for 4549162
  

  kjbracey2

  authored and

  gitster

  committed
  4549162

  Copy full SHA for 4549162

• mergetools/p4merge: swap LOCAL and REMOTE

  Show description for c699a7c
  

  kjbracey2

  authored and

  gitster

  committed
  c699a7c

  Copy full SHA for c699a7c

Commits on Feb 15, 2013

• Merge branch 'da/p4merge-mktemp-fix'

  Show description for c0acef9
  gitster

  committed
  c0acef9

  Copy full SHA for c0acef9

Commits on Feb 10, 2013

• p4merge: fix printf usage

  Show description for d272c84
  

  davvid

  authored and

  gitster

  committed
  d272c84

  Copy full SHA for d272c84

Commits on Feb 7, 2013

• Merge branch 'ss/mergetools-tortoise'

  Show description for eeaf4e7
  gitster

  committed
  eeaf4e7

  Copy full SHA for eeaf4e7

• Merge branch 'jk/mergetool'

  Show description for 55f56fe
  gitster

  committed
  55f56fe

  Copy full SHA for 55f56fe

Commits on Feb 2, 2013

• mergetools: teach tortoisemerge to handle filenames with SP correctly

  Show description for 81ed7b9
  

  Sven Strickroth

  authored and

  gitster

  committed
  81ed7b9

  Copy full SHA for 81ed7b9