Commits

Breadcrumbs

History for

onb41597d

User selector

All users

Datepicker

All time

Commit History

Commits on Jan 29, 2012

• Merge branch 'rs/diff-postimage-in-context'

  Show description for 86e15ff
  gitster

  committed
  86e15ff

  Copy full SHA for 86e15ff

Commits on Jan 6, 2012

• xdiff: print post-image for common records instead of pre-image

  Show description for baf5aaa
  

  René Scharfe

  authored and

  gitster

  committed
  baf5aaa

  Copy full SHA for baf5aaa

Commits on Oct 19, 2011

• Merge branch 'rs/diff-whole-function'

  Show description for 9b55aa0
  gitster

  committed
  9b55aa0

  Copy full SHA for 9b55aa0

Commits on Oct 14, 2011

• Merge branch 'rs/diff-cleanup-records-fix'

  Show description for 7a63a92
  gitster

  committed
  7a63a92

  Copy full SHA for 7a63a92

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

• xdiff: factor out get_func_line()

  Show description for f99f4b3
  

  René Scharfe

  authored and

  gitster

  committed
  f99f4b3

  Copy full SHA for f99f4b3

Commits on Sep 26, 2011

• Revert removal of multi-match discard heuristic in 27af01

  Show description for c5aa906
  

  René Scharfe

  authored and

  gitster

  committed
  c5aa906

  Copy full SHA for c5aa906

Commits on Sep 6, 2011

• Merge branch 'rc/histogram-diff'

  Show description for b648557
  gitster

  committed
  b648557

  Copy full SHA for b648557

Commits on Aug 31, 2011

• xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()

  Show description for 2738bc3
  

  rctay

  authored and

  gitster

  committed
  2738bc3

  Copy full SHA for 2738bc3

Commits on Aug 18, 2011

• Merge branch 'rc/histogram-diff' into HEAD

  Show description for b14b969
  gitster

  committed
  b14b969

  Copy full SHA for b14b969

• xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()

  Show description for 27af01d
  

  rctay

  authored and

  gitster

  committed
  27af01d

  Copy full SHA for 27af01d

Commits on Aug 8, 2011

• xdiff/xhistogram: drop need for additional variable

  Show description for 6486a84
  

  rctay

  authored and

  gitster

  committed
  6486a84

  Copy full SHA for 6486a84

• xdiff/xhistogram: rely on xdl_trim_ends()

  Show description for 43ca753
  

  rctay

  authored and

  gitster

  committed
  43ca753

  Copy full SHA for 43ca753

• xdiff/xhistogram: rework handling of recursed results

  Show description for 19f7a9c
  

  rctay

  authored and

  gitster

  committed
  19f7a9c

  Copy full SHA for 19f7a9c

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

• xdiff/xprepare: use a smaller sample size for histogram diff

  Show description for 86abba8
  

  rctay

  authored and

  gitster

  committed
  86abba8

  Copy full SHA for 86abba8

• xdiff/xprepare: skip classification

  Show description for 9f37c27
  

  rctay

  authored and

  gitster

  committed
  9f37c27

  Copy full SHA for 9f37c27

• teach --histogram to diff

  Show description for 8c912ee
  

  rctay

  authored and

  gitster

  committed
  8c912ee

  Copy full SHA for 8c912ee

Commits on Jul 7, 2011

• xdiff/xpatience: factor out fall-back-diff function

  Show description for 1d26b25
  

  rctay

  authored and

  gitster

  committed
  1d26b25

  Copy full SHA for 1d26b25

• xdiff/xprepare: refactor abort cleanups

  Show description for 159607a
  

  rctay

  authored and

  gitster

  committed
  159607a

  Copy full SHA for 159607a

• xdiff/xprepare: use memset()

  Show description for 452f4fa
  

  rctay

  authored and

  gitster

  committed
  452f4fa

  Copy full SHA for 452f4fa

Commits on Nov 17, 2010

• Merge branch 'cb/diff-fname-optim'

  Show description for 8cf666c
  gitster

  committed
  8cf666c

  Copy full SHA for 8cf666c

Commits on Oct 6, 2010

• xdiff: cast arguments for ctype functions to unsigned char

  Show description for 349362c
  

  jrn

  authored and

  gitster

  committed
  349362c

  Copy full SHA for 349362c

Commits on Sep 30, 2010

• diff: avoid repeated scanning while looking for funcname

  Show description for c099789
  

  René Scharfe

  authored and

  gitster

  committed
  c099789

  Copy full SHA for c099789

Commits on Jul 6, 2010

• xdiff: optimise for no whitespace difference when ignoring whitespace.

  Show description for b4cf0f1
  

  dgreid

  authored and

  gitster

  committed
  b4cf0f1

  Copy full SHA for b4cf0f1

Commits on May 1, 2010

• xdiff/xmerge.c: use memset() instead of explicit for-loop

  Show description for c8c073c
  

  squadette

  authored and

  gitster

  committed
  c8c073c

  Copy full SHA for c8c073c

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 Sep 1, 2009

• Merge branch 'tf/diff-whitespace-incomplete-line'

  Show description for d34eca0
  gitster

  committed
  d34eca0

  Copy full SHA for d34eca0

Pagination

Previous

Next