Commits

Breadcrumbs

History for

onfe5d1d3

User selector

All users

All time

Commit History

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

• xdl_merge(): fix an off-by-one bug

  Show description for 875b8ce
  

  dscho

  authored and

  Junio C Hamano

  committed
  875b8ce

  Copy full SHA for 875b8ce

• xmerge: make return value from xdl_merge() more usable.

  Show description for 53a7085
  

  Junio C Hamano

  committed
  53a7085

  Copy full SHA for 53a7085

• xdiff: add xdl_merge()

  Show description for 857b933
  

  dscho

  authored and

  Junio C Hamano

  committed
  857b933

  Copy full SHA for 857b933

Commits on Nov 24, 2006

• Increase length of function name buffer

  Show description for f73da29
  

  andyparkins

  authored and

  Junio C Hamano

  committed
  f73da29

  Copy full SHA for f73da29

Commits on Oct 25, 2006

• xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines

  Show description for 70da769
  

  Petr Baudis

  authored and

  Junio C Hamano

  committed
  70da769

  Copy full SHA for 70da769

Commits on Oct 23, 2006

• xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.

  Show description for 67aef03
  

  meyering

  authored and

  Junio C Hamano

  committed
  67aef03

  Copy full SHA for 67aef03

Commits on Oct 17, 2006

• Merge branch 'maint'

  Show description for 3453f86
  

  Junio C Hamano

  committed
  3453f86

  Copy full SHA for 3453f86

• Fix hash function in xdiff library

  Show description for 9de0834
  

  Linus Torvalds

  authored and

  Junio C Hamano

  committed
  9de0834

  Copy full SHA for 9de0834

Commits on Oct 12, 2006

• diff: fix 2 whitespace issues

  Show description for 2344d47
  

  dscho

  authored and

  Junio C Hamano

  committed
  2344d47

  Copy full SHA for 2344d47

Commits on Jul 13, 2006

• Merge branch 'lt/merge-tree'

  Show description for 096b173
  

  Junio C Hamano

  committed
  096b173

  Copy full SHA for 096b173

Commits on Jul 10, 2006

• Fix more typos, primarily in the code

  Show description for 82e5a82
  

  Pavel Roskin

  authored and

  Junio C Hamano

  committed
  82e5a82

  Copy full SHA for 82e5a82

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 Jun 20, 2006

• xdiff: minor changes to match libxdiff-0.21

  Show description for d281786
  

  Junio C Hamano

  committed
  d281786

  Copy full SHA for d281786

Commits on Apr 13, 2006

• xdiff: post-process hunks to make them consistent.

  

  davidel

  authored and

  Junio C Hamano

  committed
  295ba2f

  Copy full SHA for 295ba2f

Commits on Apr 9, 2006

• xdiff/xdiffi.c: fix warnings about possibly uninitialized variables

  Show description for 0ed49a3
  

  fiberbit

  authored and

  Junio C Hamano

  committed
  0ed49a3

  Copy full SHA for 0ed49a3

Commits on Apr 4, 2006

• Clean-up trivially redundant diff.

  Show description for ca557af
  

  davidel

  authored and

  Junio C Hamano

  committed
  ca557af

  Copy full SHA for ca557af

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

• built-in diff: minimum tweaks

  Show description for 3ce8f08
  

  Junio C Hamano

  committed
  3ce8f08

  Copy full SHA for 3ce8f08

• builtin-diff: \No newline at end of file.

  Show description for 621c53c
  

  Linus Torvalds

  authored and

  Junio C Hamano

  committed
  621c53c

  Copy full SHA for 621c53c

• 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