Commits

Breadcrumbs

History for

onfe01ef3

User selector

All users

All time

Commit History

Commits on Nov 17, 2010

• Merge branch 'cb/diff-fname-optim'

  Show description for 8cf666c
  gitster

  committed
  8cf666c

  Copy full SHA for 8cf666c

Commits on Oct 6, 2010

• xdiff: cast arguments for ctype functions to unsigned char

  Show description for 349362c
  

  jrn

  authored and

  gitster

  committed
  349362c

  Copy full SHA for 349362c

Commits on Sep 30, 2010

• diff: avoid repeated scanning while looking for funcname

  Show description for c099789
  

  René Scharfe

  authored and

  gitster

  committed
  c099789

  Copy full SHA for c099789

Commits on Jul 6, 2010

• xdiff: optimise for no whitespace difference when ignoring whitespace.

  Show description for b4cf0f1
  

  dgreid

  authored and

  gitster

  committed
  b4cf0f1

  Copy full SHA for b4cf0f1

Commits on May 1, 2010

• xdiff/xmerge.c: use memset() instead of explicit for-loop

  Show description for c8c073c
  

  squadette

  authored and

  gitster

  committed
  c8c073c

  Copy full SHA for c8c073c

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 Sep 1, 2009

• Merge branch 'tf/diff-whitespace-incomplete-line'

  Show description for d34eca0
  gitster

  committed
  d34eca0

  Copy full SHA for d34eca0

Commits on Aug 23, 2009

• xutils: Fix xdl_recmatch() on incomplete lines

  Show description for 3b5ef0e
  gitster

  committed
  3b5ef0e

  Copy full SHA for 3b5ef0e

• xutils: Fix hashing an incomplete line with whitespaces at the end

  Show description for 78ed710
  gitster

  committed
  78ed710

  Copy full SHA for 78ed710

Commits on Jul 23, 2009

• refactor: use bitsizeof() instead of 8 * sizeof()

  Show description for f630cfd
  

  MadCoder

  authored and

  gitster

  committed
  f630cfd

  Copy full SHA for f630cfd

Commits on Jun 2, 2009

• Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint

  Show description for 456cb4c
  gitster

  committed
  456cb4c

  Copy full SHA for 456cb4c

Commits on May 25, 2009

• Change xdl_merge to generate output even for null merges

  Show description for 5719db9
  

  hashpling

  authored and

  gitster

  committed
  5719db9

  Copy full SHA for 5719db9

Commits on Apr 23, 2009

• Fix typos / spelling in comments

  Show description for 3ea3c21
  

  MikeRalphson

  authored and

  gitster

  committed
  3ea3c21

  Copy full SHA for 3ea3c21

Commits on Mar 16, 2009

• Fix various dead stores found by the clang static analyzer

  Show description for 8e24cba
  

  d0k

  authored and

  gitster

  committed
  8e24cba

  Copy full SHA for 8e24cba

Commits on Feb 6, 2009

• Merge branch 'kc/maint-diff-bwi-fix' into maint

  Show description for 8c4c286
  gitster

  committed
  8c4c286

  Copy full SHA for 8c4c286

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 22, 2009

• Merge branch 'kc/maint-diff-bwi-fix'

  Show description for 9a01387
  gitster

  committed
  9a01387

  Copy full SHA for 9a01387

Commits on Jan 20, 2009

• Fix combined use of whitespace ignore options to diff

  Show description for 6d12ace
  

  Keith Cascio

  authored and

  gitster

  committed
  6d12ace

  Copy full SHA for 6d12ace

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 Dec 3, 2008

• xdiff: give up scanning similar lines early

  Show description for 733070b
  

  davidel

  authored and

  gitster

  committed
  733070b

  Copy full SHA for 733070b

Commits on Nov 13, 2008

• Merge branch 'dl/xdiff'

  Show description for ac2abb4
  gitster

  committed
  ac2abb4

  Copy full SHA for ac2abb4

Commits on Nov 8, 2008

• xdiff: give up scanning similar lines early

  Show description for 9b28d55
  

  davidel

  authored and

  gitster

  committed
  9b28d55

  Copy full SHA for 9b28d55

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

• xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less

  Show description for 8313374
  gitster

  committed
  8313374

  Copy full SHA for 8313374

• xmerge.c: minimum readability fixups

  Show description for 838338c
  gitster

  committed
  838338c

  Copy full SHA for 838338c

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

  Show description for e0af48e
  gitster

  committed
  e0af48e

  Copy full SHA for e0af48e

• xdl_fill_merge_buffer(): separate out a too deeply nested function

  Show description for f2b25dd
  gitster

  committed
  f2b25dd

  Copy full SHA for f2b25dd