Commits

Breadcrumbs

History for

onmaster

User selector

All users

All time

Commit History

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 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 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

Commits on Apr 12, 2019

• xdiff: use xmalloc/xrealloc

  Show description for 36c8319
  

  peff

  authored and

  gitster

  committed
  36c8319

  Copy full SHA for 36c8319

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 Jul 17, 2018

• xdiff/xdiff.h: remove unused flags

  Show description for 25790be
  

  stefanbeller

  authored and

  gitster

  committed
  25790be

  Copy full SHA for 25790be

Commits on Nov 28, 2017

• diff: support anchoring line(s)

  Show description for 2477ab2
  

  jonathantanmy

  authored and

  gitster

  committed
  2477ab2

  Copy full SHA for 2477ab2

Commits on Nov 27, 2017

• Merge branch 'jc/ignore-cr-at-eol'

  Show description for 10f65c2
  gitster

  committed
  10f65c2

  Copy full SHA for 10f65c2

Commits on Nov 9, 2017

• Replace Free Software Foundation address in license notices

  Show description for 4842579
  

  tmzullinger

  authored and

  gitster

  committed
  4842579

  Copy full SHA for 4842579

Commits on Nov 8, 2017

• diff: --ignore-cr-at-eol

  Show description for e9282f0
  gitster

  committed
  e9282f0

  Copy full SHA for e9282f0

Commits on Oct 27, 2017

• xdiff: reassign xpparm_t.flags bits

  Show description for 446d12c
  gitster

  committed
  446d12c

  Copy full SHA for 446d12c

Commits on Dec 23, 2016

• diff: retire "compaction" heuristics

  Show description for 3cde4e0
  gitster

  committed
  3cde4e0

  Copy full SHA for 3cde4e0

Commits on Sep 19, 2016

• diff: improve positioning of add/delete blocks in diffs

  Show description for 433860f
  

  mhagger

  authored and

  gitster

  committed
  433860f

  Copy full SHA for 433860f

Commits on May 6, 2016

• Merge branch 'jk/diff-compact-heuristic'

  Show description for 0018da1
  gitster

  committed
  0018da1

  Copy full SHA for 0018da1

Commits on Apr 19, 2016

• xdiff: implement empty line chunk heuristic

  Show description for d634d61
  

  stefanbeller

  authored and

  gitster

  committed
  d634d61

  Copy full SHA for d634d61

Commits on Feb 23, 2016

• xdiff: drop XDL_EMIT_COMMON

  Show description for 907681e
  

  peff

  authored and

  gitster

  committed
  907681e

  Copy full SHA for 907681e

Commits on Jun 19, 2013

• diff: add --ignore-blank-lines option

  Show description for 36617af
  

  apelisse

  authored and

  gitster

  committed
  36617af

  Copy full SHA for 36617af

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