Commits

Breadcrumbs

History for

ona3f5b66

User selector

All users

Datepicker

All time

Commit History

Commits on Jan 16, 2017

• xdiff -W: relax end-of-file function detection

  Show description for 540d3eb
  

  vegard

  authored and

  gitster

  committed
  540d3eb

  Copy full SHA for 540d3eb

Commits on Jan 10, 2017

• Merge branch 'jc/retire-compaction-heuristics'

  Show description for 2ced5f2
  gitster

  committed
  2ced5f2

  Copy full SHA for 2ced5f2

Commits on Dec 23, 2016

• diff: retire "compaction" heuristics

  Show description for 3cde4e0
  gitster

  committed
  3cde4e0

  Copy full SHA for 3cde4e0

Commits on Dec 6, 2016

• xdiff: drop XDL_FAST_HASH

  Show description for 1f7c926
  

  peff

  authored and

  gitster

  committed
  1f7c926

  Copy full SHA for 1f7c926

Commits on Oct 3, 2016

• Merge branch 'mh/diff-indent-heuristic'

  Show description for e704c61
  gitster

  committed
  e704c61

  Copy full SHA for e704c61

Commits on Sep 27, 2016

• xdiff: rename "struct group" to "struct xdlgroup"

  Show description for 134e40d
  

  peff

  authored and

  gitster

  committed
  134e40d

  Copy full SHA for 134e40d

Commits on Sep 26, 2016

• Merge branch 'mh/diff-indent-heuristic'

  Show description for b7af6ae
  gitster

  committed
  b7af6ae

  Copy full SHA for b7af6ae

Commits on Sep 21, 2016

• Merge branch 'rs/xdiff-merge-overlapping-hunks-for-W-context'

  Show description for 4ed3863
  gitster

  committed
  4ed3863

  Copy full SHA for 4ed3863

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 Sep 14, 2016

• xdiff: fix merging of hunks with -W context and -u context

  Show description for 45d2f75
  

  rscharfe

  authored and

  gitster

  committed
  45d2f75

  Copy full SHA for 45d2f75

Commits on Sep 7, 2016

• xdiff: remove unneeded declarations

  Show description for 5e4e5bb
  

  stefanbeller

  authored and

  gitster

  committed
  5e4e5bb

  Copy full SHA for 5e4e5bb

Commits on Aug 23, 2016

• xdl_change_compact(): introduce the concept of a change group

  Show description for e8adf23
  

  mhagger

  authored and

  gitster

  committed
  e8adf23

  Copy full SHA for e8adf23

• recs_match(): take two xrecord_t pointers as arguments

  Show description for 152598c
  

  mhagger

  authored and

  gitster

  committed
  152598c

  Copy full SHA for 152598c

• is_blank_line(): take a single xrecord_t as argument

  Show description for c06c0b6
  

  mhagger

  authored and

  gitster

  committed
  c06c0b6

  Copy full SHA for c06c0b6

• xdl_change_compact(): only use heuristic if group can't be matched

  Show description for cb0eded
  

  mhagger

  authored and

  gitster

  committed
  cb0eded

  Copy full SHA for cb0eded

• xdl_change_compact(): fix compaction heuristic to adjust ixo

  Show description for a8fd78c
  

  mhagger

  authored and

  gitster

  committed
  a8fd78c

  Copy full SHA for a8fd78c

Commits on Aug 8, 2016

• Merge branch 'js/ignore-space-at-eol' into maint

  Show description for a52fb9b
  gitster

  committed
  a52fb9b

  Copy full SHA for a52fb9b

Commits on Jul 11, 2016

• diff: fix a double off-by-one with --ignore-space-at-eol

  Show description for 044fb19
  

  dscho

  authored and

  gitster

  committed
  044fb19

  Copy full SHA for 044fb19

Commits on Jun 27, 2016

• Merge branch 'rs/xdiff-hunk-with-func-line' into maint

  Show description for fda65fa
  gitster

  committed
  fda65fa

  Copy full SHA for fda65fa

Commits on Jun 20, 2016

• Merge branch 'rs/xdiff-hunk-with-func-line'

  Show description for d15c05a
  gitster

  committed
  d15c05a

  Copy full SHA for d15c05a

Commits on Jun 9, 2016

• xdiff: fix merging of appended hunk with -W

  Show description for 6f8d9bc
  

  rscharfe

  authored and

  gitster

  committed
  6f8d9bc

  Copy full SHA for 6f8d9bc

Commits on May 31, 2016

• xdiff: -W: don't include common trailing empty lines in context

  Show description for 9e6a4cf
  

  rscharfe

  authored and

  gitster

  committed
  9e6a4cf

  Copy full SHA for 9e6a4cf

• xdiff: ignore empty lines before added functions with -W

  Show description for 392f6d3
  

  rscharfe

  authored and

  gitster

  committed
  392f6d3

  Copy full SHA for 392f6d3

• xdiff: handle appended chunks better with -W

  Show description for 6d5badb
  

  rscharfe

  authored and

  gitster

  committed
  6d5badb

  Copy full SHA for 6d5badb

• xdiff: factor out match_func_rec()

  Show description for ff2981f
  

  rscharfe

  authored and

  gitster

  committed
  ff2981f

  Copy full SHA for ff2981f

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 Apr 18, 2016

• xdiff: add recs_match helper function

  Show description for 92e5b62
  

  jacob-keller

  authored and

  gitster

  committed
  92e5b62

  Copy full SHA for 92e5b62

Commits on Apr 3, 2016

• Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'

  Show description for aa3a2c2
  gitster

  committed
  aa3a2c2

  Copy full SHA for aa3a2c2

Commits on Mar 4, 2016

• xdiff/xprepare: fix a memory leak

  Show description for 87f1625
  

  ramsay-jones

  authored and

  gitster

  committed
  87f1625

  Copy full SHA for 87f1625

• xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits

  Show description for 5cd6978
  

  ramsay-jones

  authored and

  gitster

  committed
  5cd6978

  Copy full SHA for 5cd6978

Commits on Feb 26, 2016

• Merge branch 'ps/plug-xdl-merge-leak'

  Show description for c1fa85f
  gitster

  committed
  c1fa85f

  Copy full SHA for c1fa85f

• Merge branch 'jk/no-diff-emit-common'

  Show description for 18b26b1
  gitster

  committed
  18b26b1

  Copy full SHA for 18b26b1

Commits on Feb 23, 2016

• xdiff/xmerge: fix memory leak in xdl_merge

  Show description for 4867f11
  

  pks-t

  authored and

  gitster

  committed
  4867f11

  Copy full SHA for 4867f11

• xdiff: drop XDL_EMIT_COMMON

  Show description for 907681e
  

  peff

  authored and

  gitster

  committed
  907681e

  Copy full SHA for 907681e

Pagination

Previous

Next