Commits

Breadcrumbs

History for

onmaster

User selector

All users

Datepicker

All time

Commit History

Commits on Feb 15, 2013

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

  gitster

  committedFeb 15, 2013
  c0acef9

Commits on Feb 10, 2013

• p4merge: fix printf usage

  

  davvid

  authored and

  gitster

  committedFeb 10, 2013
  d272c84

Commits on Feb 7, 2013

• Merge branch 'ss/mergetools-tortoise'

  gitster

  committedFeb 7, 2013
  eeaf4e7

• Merge branch 'jk/mergetool'

  gitster

  committedFeb 7, 2013
  55f56fe

Commits on Feb 2, 2013

• mergetools: teach tortoisemerge to handle filenames with SP correctly

  

  Sven Strickroth

  authored and

  gitster

  committedFeb 2, 2013
  81ed7b9

Commits on Jan 29, 2013

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

  

  davvid

  authored and

  gitster

  committedJan 29, 2013
  073678b

Commits on Jan 28, 2013

• mergetools/vim: remove redundant diff command

  

  davvid

  authored and

  gitster

  committedJan 28, 2013
  b2a6b71

Commits on Jan 27, 2013

• mergetools: support TortoiseGitMerge

  

  Sven Strickroth

  authored and

  gitster

  committedJan 27, 2013
  8bf6719

Commits on Dec 27, 2012

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

  

  davvid

  authored and

  gitster

  committedDec 27, 2012
  950b568

Commits on Oct 25, 2012

• Merge branch 'da/mergetools-p4'

  peff

  committedOct 25, 2012
  33d3c6b

Commits on Oct 11, 2012

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

  

  davvid

  authored and

  gitster

  committedOct 11, 2012
  3facc60

Commits on Oct 1, 2012

• Merge branch 'da/mergetool-custom'

  gitster

  committedOct 1, 2012
  5ec11ab

Commits on Sep 25, 2012

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

  

  davvid

  authored and

  gitster

  committedSep 25, 2012
  a427ef7

Commits on Aug 10, 2012

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

  

  sschuberth

  authored and

  gitster

  committedAug 10, 2012
  755e8b3

Commits on Mar 5, 2012

• mergetools: add a plug-in to support DeltaWalker

  

  thenigan

  authored and

  gitster

  committedMar 5, 2012
  284a126

Commits on Feb 14, 2012

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

  gitster

  committedFeb 14, 2012
  746b6fb

Commits on Feb 10, 2012

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

  

  jrn

  authored and

  gitster

  committedFeb 10, 2012
  759a904

Commits on Oct 16, 2011

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

  

  patthoyts

  authored and

  gitster

  committedOct 16, 2011
  8850c3d

Commits on Aug 19, 2011

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

  

  davvid

  authored and

  gitster

  committedAug 19, 2011
  f61bd9c

• mergetool--lib: Refactor tools into separate files

  

  davvid

  authored and

  gitster

  committedAug 19, 2011
  bc7a96a

Loading