Commits

Breadcrumbs

History for

on6f1c189

User selector

All users

Datepicker

All time

Commit History

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

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

Commits on Jan 28, 2013

• mergetools/vim: remove redundant diff command

  Show description for b2a6b71
  

  davvid

  authored and

  gitster

  committed
  b2a6b71

  Copy full SHA for b2a6b71

Commits on Jan 27, 2013

• mergetools: support TortoiseGitMerge

  Show description for 8bf6719
  

  Sven Strickroth

  authored and

  gitster

  committed
  8bf6719

  Copy full SHA for 8bf6719

Commits on Dec 27, 2012

• mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

  Show description for 950b568
  

  davvid

  authored and

  gitster

  committed
  950b568

  Copy full SHA for 950b568

Commits on Oct 25, 2012

• Merge branch 'da/mergetools-p4'

  Show description for 33d3c6b
  peff

  committed
  33d3c6b

  Copy full SHA for 33d3c6b

Commits on Oct 11, 2012

• mergetools/p4merge: Handle "/dev/null"

  Show description for 3facc60
  

  davvid

  authored and

  gitster

  committed
  3facc60

  Copy full SHA for 3facc60

Commits on Oct 1, 2012

• Merge branch 'da/mergetool-custom'

  Show description for 5ec11ab
  gitster

  committed
  5ec11ab

  Copy full SHA for 5ec11ab

Commits on Sep 25, 2012

• mergetool--lib: Allow custom commands to override built-ins

  Show description for a427ef7
  

  davvid

  authored and

  gitster

  committed
  a427ef7

  Copy full SHA for a427ef7

Commits on Aug 10, 2012

• Add Code Compare v2.80.4 as a merge / diff tool for Windows

  Show description for 755e8b3
  

  sschuberth

  authored and

  gitster

  committed
  755e8b3

  Copy full SHA for 755e8b3

Commits on Mar 5, 2012

• mergetools: add a plug-in to support DeltaWalker

  Show description for 284a126
  

  thenigan

  authored and

  gitster

  committed
  284a126

  Copy full SHA for 284a126

Commits on Feb 14, 2012

• Merge branch 'jn/ancient-meld-support'

  Show description for 746b6fb
  gitster

  committed
  746b6fb

  Copy full SHA for 746b6fb

Commits on Feb 10, 2012

• mergetools/meld: Use --help output to detect --output support

  Show description for 759a904
  

  jrn

  authored and

  gitster

  committed
  759a904

  Copy full SHA for 759a904

Commits on Oct 16, 2011

• mergetools: use the correct tool for Beyond Compare 3 on Windows

  Show description for 8850c3d
  

  patthoyts

  authored and

  gitster

  committed
  8850c3d

  Copy full SHA for 8850c3d

Commits on Aug 19, 2011

• mergetools/meld: Use '--output' when available

  Show description for f61bd9c
  

  davvid

  authored and

  gitster

  committed
  f61bd9c

  Copy full SHA for f61bd9c

• mergetool--lib: Refactor tools into separate files

  Show description for bc7a96a
  

  davvid

  authored and

  gitster

  committed
  bc7a96a

  Copy full SHA for bc7a96a

Loading