Commits

Breadcrumbs

History for

onmaint

User selector

All users

All time

Commit History

Commits on Dec 21, 2021

• Merge branch 'pw/xdiff-classify-record-in-histogram'

  Show description for a0f5ca9
  gitster

  committed
  a0f5ca9

  Copy full SHA for a0f5ca9

Commits on Dec 5, 2021

• xdiff: drop unused flags parameter from recs_match

  Show description for 1e45db1
  

  peff

  authored and

  gitster

  committed
  1e45db1

  Copy full SHA for 1e45db1

• xdiff: drop xpparam_t parameter from histogram cmp_recs()

  Show description for 2544945
  

  peff

  authored and

  gitster

  committed
  2544945

  Copy full SHA for 2544945

• xdiff: drop CMP_ENV macro from xhistogram

  Show description for cf0b26d
  

  peff

  authored and

  gitster

  committed
  cf0b26d

  Copy full SHA for cf0b26d

Commits on Dec 1, 2021

• xdiff: implement a zealous diff3, or "zdiff3"

  Show description for 4496526
  

  2 peopleauthored and

  gitster

  committed
  4496526

  Copy full SHA for 4496526

Commits on Nov 19, 2021

• xdiff: simplify comparison

  Show description for 6b13bc3
  

  phillipwood

  authored and

  gitster

  committed
  6b13bc3

  Copy full SHA for 6b13bc3

• xdiff: avoid unnecessary memory allocations

  Show description for b82dd3f
  

  phillipwood

  authored and

  gitster

  committed
  b82dd3f

  Copy full SHA for b82dd3f

• diff histogram: intern strings

  Show description for 663c5ad
  

  phillipwood

  authored and

  gitster

  committed
  663c5ad

  Copy full SHA for 663c5ad

Commits on Jul 13, 2021

• Merge branch 'ab/pickaxe-pcre2'

  Show description for 4da281e
  gitster

  committed
  4da281e

  Copy full SHA for 4da281e

Commits on Jul 8, 2021

• Merge branch 'ab/xdiff-bug-cleanup'

  Show description for 8e48f11
  gitster

  committed
  8e48f11

  Copy full SHA for 8e48f11

Commits on Jun 8, 2021

• xdiff: use BUG(...), not xdl_bug(...)

  Show description for 546096a
  

  avar

  authored and

  gitster

  committed
  546096a

  Copy full SHA for 546096a

Commits on May 13, 2021

• Merge branch 'pw/patience-diff-clean-up'

  Show description for daffa89
  gitster

  committed
  daffa89

  Copy full SHA for daffa89

Commits on May 11, 2021

• xdiff-interface: replace discard_hunk_line() with a flag

  Show description for 5d93460
  

  avar

  authored and

  gitster

  committed
  5d93460

  Copy full SHA for 5d93460

Commits on May 5, 2021

• patience diff: remove unused variable

  Show description for f91371b
  

  phillipwood

  authored and

  gitster

  committed
  f91371b

  Copy full SHA for f91371b

• patience diff: remove unnecessary string comparisons

  Show description for 204aa2d
  

  phillipwood

  authored and

  gitster

  committed
  204aa2d

  Copy full SHA for 204aa2d

Commits on Oct 20, 2020

• diff: add -I<regex> that ignores matching changes

  Show description for 296d4a9
  

  kempniu

  authored and

  gitster

  committed
  296d4a9

  Copy full SHA for 296d4a9

• merge-base, xdiff: zero out xpparam_t structures

  Show description for ec7967c
  

  kempniu

  authored and

  gitster

  committed
  ec7967c

  Copy full SHA for ec7967c

Commits on Dec 16, 2019

• Merge branch 'rs/xdiff-ignore-ws-w-func-context'

  Show description for f0070a7
  gitster

  committed
  f0070a7

  Copy full SHA for f0070a7

Commits on Dec 5, 2019

• xdiff: unignore changes in function context

  Show description for 0bb313a
  

  rscharfe

  authored and

  gitster

  committed
  0bb313a

  Copy full SHA for 0bb313a

Commits on Oct 9, 2019

• xdiffi: fix typos and touch up comments

  Show description for 03d3b12
  

  dscho

  authored and

  gitster

  committed
  03d3b12

  Copy full SHA for 03d3b12

Commits on Jul 31, 2019

• Merge branch 'cb/xdiff-no-system-includes-in-dot-c'

  Show description for d163b6a
  gitster

  committed
  d163b6a

  Copy full SHA for d163b6a

Commits on Jul 29, 2019

• Merge branch 'jk/xdiff-clamp-funcname-context-index'

  Show description for c3d4c20
  gitster

  committed
  c3d4c20

  Copy full SHA for c3d4c20

• xdiff: remove duplicate headers from xpatience.c

  Show description for 81ed2b4
  

  carenas

  authored and

  gitster

  committed
  81ed2b4

  Copy full SHA for 81ed2b4

• xdiff: remove duplicate headers from xhistogram.c

  Show description for 29a0f90
  

  carenas

  authored and

  gitster

  committed
  29a0f90

  Copy full SHA for 29a0f90

• xdiff: drop system includes in xutils.c

  Show description for 0d0e1e8
  

  carenas

  authored and

  gitster

  committed
  0d0e1e8

  Copy full SHA for 0d0e1e8

Commits on Jul 23, 2019

• xdiff: clamp function context indices in post-image

  Show description for b777f3f
  

  peff

  authored and

  gitster

  committed
  b777f3f

  Copy full SHA for b777f3f

Commits on Apr 12, 2019

• xdiff: use xmalloc/xrealloc

  Show description for 36c8319
  

  peff

  authored and

  gitster

  committed
  36c8319

  Copy full SHA for 36c8319

• xdiff: use git-compat-util

  Show description for b46054b
  

  peff

  authored and

  gitster

  committed
  b46054b

  Copy full SHA for b46054b

Commits on Nov 2, 2018

• xdiff: provide a separate emit callback for hunks

  Show description for 611e42a
  

  peff

  authored and

  gitster

  committed
  611e42a

  Copy full SHA for 611e42a

Commits on Aug 17, 2018

• Merge branch 'sb/indent-heuristic-optim'

  Show description for 791ad49
  gitster

  committed
  791ad49

  Copy full SHA for 791ad49

Commits on Aug 15, 2018

• Merge branch 'sb/histogram-less-memory'

  Show description for 57fbd8e
  gitster

  committed
  57fbd8e

  Copy full SHA for 57fbd8e

Commits on Aug 1, 2018

• xdiff: reduce indent heuristic overhead

  Show description for 301ef85
  

  stefanbeller

  authored and

  gitster

  committed
  301ef85

  Copy full SHA for 301ef85

Commits on Jul 23, 2018

• xdiff/histogram: remove tail recursion

  Show description for 79cb2eb
  

  stefanbeller

  authored and

  gitster

  committed
  79cb2eb

  Copy full SHA for 79cb2eb

Commits on Jul 19, 2018

• xdiff/xhistogram: move index allocation into find_lcs

  Show description for 64c4e8b
  

  stefanbeller

  authored and

  gitster

  committed
  64c4e8b

  Copy full SHA for 64c4e8b

• xdiff/xhistogram: factor out memory cleanup into free_index()

  Show description for c671d4b
  

  stefanbeller

  authored and

  gitster

  committed
  c671d4b

  Copy full SHA for c671d4b