Commits

Breadcrumbs

History for

onmaster

User selector

All users

Datepicker

All time

Commit History

Commits on May 9, 2012

• xdiff: remove emit_func() and xdi_diff_hunks()

  Show description for 3319e60
  

  René Scharfe

  authored and

  gitster

  committed
  3319e60

  Copy full SHA for 3319e60

• xdiff: add hunk_func()

  Show description for 467d348
  

  René Scharfe

  authored and

  gitster

  committed
  467d348

  Copy full SHA for 467d348

Commits on Feb 19, 2012

• xdiff: PATIENCE/HISTOGRAM are not independent option bits

  Show description for 307ab20
  gitster

  committed
  307ab20

  Copy full SHA for 307ab20

• xdiff: remove XDL_PATCH_* macros

  Show description for e5b0662
  gitster

  committed
  e5b0662

  Copy full SHA for e5b0662

Commits on Oct 10, 2011

• diff: add option to show whole functions as context

  Show description for 14937c2
  

  René Scharfe

  authored and

  gitster

  committed
  14937c2

  Copy full SHA for 14937c2

Commits on Aug 3, 2011

• xdiff: do away with xdl_mmfile_next()

  Show description for 739864b
  

  rctay

  authored and

  gitster

  committed
  739864b

  Copy full SHA for 739864b

Commits on Jul 12, 2011

• teach --histogram to diff

  Show description for 8c912ee
  

  rctay

  authored and

  gitster

  committed
  8c912ee

  Copy full SHA for 8c912ee

Commits on Mar 21, 2010

• xdl_merge(): move file1 and file2 labels to xmparam structure

  Show description for a4b5e91
  

  jrn

  authored and

  gitster

  committed
  a4b5e91

  Copy full SHA for a4b5e91

• xdl_merge(): add optional ancestor label to diff3-style output

  Show description for 8a16143
  

  jrn

  authored and

  gitster

  committed
  8a16143

  Copy full SHA for 8a16143

Commits on Mar 2, 2010

• refactor merge flags into xmparam_t

  Show description for 560119b
  

  bertwesarg

  authored and

  gitster

  committed
  560119b

  Copy full SHA for 560119b

• make union merge an xdl merge favor

  Show description for cd1d61c
  

  bertwesarg

  authored and

  gitster

  committed
  cd1d61c

  Copy full SHA for cd1d61c

Commits on Jan 21, 2010

• Merge branch 'jc/conflict-marker-size'

  Show description for 06dbc1e
  gitster

  committed
  06dbc1e

  Copy full SHA for 06dbc1e

Commits on Jan 17, 2010

• xdl_merge(): allow passing down marker_size in xmparam_t

  Show description for 9914cf4
  gitster

  committed
  9914cf4

  Copy full SHA for 9914cf4

• xdl_merge(): introduce xmparam_t for merge specific parameters

  Show description for 00f8f97
  gitster

  committed
  00f8f97

  Copy full SHA for 00f8f97

Commits on Nov 30, 2009

• git-merge-file --ours, --theirs

  Show description for 73eb40e
  gitster

  committed
  73eb40e

  Copy full SHA for 73eb40e

Commits on Jan 24, 2009

• Merge branch 'js/patience-diff'

  Show description for 5dc1308
  gitster

  committed
  5dc1308

  Copy full SHA for 5dc1308

Commits on Jan 7, 2009

• Implement the patience diff algorithm

  Show description for 92b7de9
  

  dscho

  authored and

  gitster

  committed
  92b7de9

  Copy full SHA for 92b7de9

Commits on Dec 29, 2008

• diff: add option to show context between close hunks

  Show description for 6d0e674
  

  René Scharfe

  authored and

  gitster

  committed
  6d0e674

  Copy full SHA for 6d0e674

Commits on Oct 25, 2008

• Allow alternate "low-level" emit function from xdl_diff

  Show description for ef2e62f
  

  bdowning

  authored and

  gitster

  committed
  ef2e62f

  Copy full SHA for ef2e62f

Commits on Aug 31, 2008

• xdiff-merge: optionally show conflicts in "diff3 -m" style

  Show description for e0af48e
  gitster

  committed
  e0af48e

  Copy full SHA for e0af48e

Commits on Feb 18, 2008

• xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM

  Show description for ee95ec5
  

  dscho

  authored and

  gitster

  committed
  ee95ec5

  Copy full SHA for ee95ec5

Commits on Jul 6, 2007

• Per-path attribute based hunk header selection.

  Show description for f258475
  gitster

  committed
  f258475

  Copy full SHA for f258475

Commits on Jun 7, 2007

• War on whitespace

  Show description for a6080a0
  gitster

  committed
  a6080a0

  Copy full SHA for a6080a0

Commits on Feb 14, 2007

• teach diff machinery about --ignore-space-at-eol

  Show description for 859f9c4
  

  dscho

  authored and

  Junio C Hamano

  committed
  859f9c4

  Copy full SHA for 859f9c4

Commits on Dec 3, 2006

• xdiff: add xdl_merge()

  Show description for 857b933
  

  dscho

  authored and

  Junio C Hamano

  committed
  857b933

  Copy full SHA for 857b933

Commits on Jun 29, 2006

• xdiff: generate "anti-diffs" aka what is common to two files

  Show description for a9ed376
  

  Linus Torvalds

  authored and

  Junio C Hamano

  committed
  a9ed376

  Copy full SHA for a9ed376

Commits on Jun 24, 2006

• Teach diff about -b and -w flags

  Show description for 0d21efa
  

  dscho

  authored and

  Junio C Hamano

  committed
  0d21efa

  Copy full SHA for 0d21efa

Commits on Mar 28, 2006

• xdiff: Show function names in hunk headers.

  Show description for acb7257
  

  distorted-mdw

  authored and

  Junio C Hamano

  committed
  acb7257

  Copy full SHA for acb7257

Commits on Mar 26, 2006

• Use a *real* built-in diff generator

  Show description for 3443546
  

  Linus Torvalds

  authored and

  Junio C Hamano

  committed
  3443546

  Copy full SHA for 3443546

Loading