Commits

Breadcrumbs

History for

onb41597d

User selector

All users

Datepicker

All time

Commit History

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

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

• xdl_merge(): make XDL_MERGE_ZEALOUS output simpler

  Show description for f407f14
  

  dscho

  authored and

  gitster

  committed
  f407f14

  Copy full SHA for f407f14

Commits on Nov 16, 2007

• Remove unreachable statements

  Show description for a777e9c
  

  Guido Ostkamp

  authored and

  gitster

  committed
  a777e9c

  Copy full SHA for a777e9c

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 8, 2007

• Missing statics.

  Show description for 52fae7d
  

  MadCoder

  authored and

  gitster

  committed
  52fae7d

  Copy full SHA for 52fae7d

Commits on Jun 7, 2007

• War on whitespace

  Show description for a6080a0
  gitster

  committed
  a6080a0

  Copy full SHA for a6080a0

Commits on Mar 20, 2007

• xdiff/xutils.c(xdl_hash_record): factor out whitespace handling

  Show description for 824f782
  

  dscho

  authored and

  Junio C Hamano

  committed
  824f782

  Copy full SHA for 824f782

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 31, 2006

• Fix yet another subtle xdl_merge() bug

  Show description for 22b6abc
  

  dscho

  authored and

  Junio C Hamano

  committed
  22b6abc

  Copy full SHA for 22b6abc

Commits on Dec 28, 2006

• xdl_merge(): fix a segmentation fault when refining conflicts

  Show description for 5d6b151
  

  dscho

  authored and

  Junio C Hamano

  committed
  5d6b151

  Copy full SHA for 5d6b151

Commits on Dec 13, 2006

• Merge branch 'master' into js/merge

  Show description for 8042ed1
  

  Junio C Hamano

  committed
  8042ed1

  Copy full SHA for 8042ed1

Commits on Dec 5, 2006

• xdl_merge(): fix and simplify conflict handling

  Show description for 98e6da8
  

  dscho

  authored and

  Junio C Hamano

  committed
  98e6da8

  Copy full SHA for 98e6da8

• diff -b: ignore whitespace at end of line

  Show description for c7c2488
  

  dscho

  authored and

  Junio C Hamano

  committed
  c7c2488

  Copy full SHA for c7c2488

Commits on Dec 3, 2006

• xdl_merge(): fix thinko

  Show description for 710daa8
  

  dscho

  authored and

  Junio C Hamano

  committed
  710daa8

  Copy full SHA for 710daa8

Pagination

Previous

Next