Commits

Breadcrumbs

History for

onmaster

User selector

All users

All time

Commit History

Commits on Feb 16, 2022

• xdiff: handle allocation failure when merging

  Show description for 43ad3af
  

  phillipwood

  authored and

  gitster

  committed
  43ad3af

  Copy full SHA for 43ad3af

• xdiff: refactor a function

  Show description for 4a37b80
  

  phillipwood

  authored and

  gitster

  committed
  4a37b80

  Copy full SHA for 4a37b80

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 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 Feb 26, 2016

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

  Show description for c1fa85f
  gitster

  committed
  c1fa85f

  Copy full SHA for c1fa85f

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

Commits on Jan 27, 2016

• merge-file: ensure that conflict sections match eol style

  Show description for 15980de
  

  dscho

  authored and

  gitster

  committed
  15980de

  Copy full SHA for 15980de

• merge-file: let conflict markers match end-of-line style of the context

  Show description for 86efa21
  

  dscho

  authored and

  gitster

  committed
  86efa21

  Copy full SHA for 86efa21

Commits on Jun 30, 2014

• git-merge-file: do not add LF at EOF while applying unrelated change

  Show description for ba31180
  

  max630

  authored and

  gitster

  committed
  ba31180

  Copy full SHA for ba31180

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 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 Jun 2, 2009

• Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint

  Show description for 456cb4c
  gitster

  committed
  456cb4c

  Copy full SHA for 456cb4c

Commits on May 25, 2009

• Change xdl_merge to generate output even for null merges

  Show description for 5719db9
  

  hashpling

  authored and

  gitster

  committed
  5719db9

  Copy full SHA for 5719db9

Commits on Aug 31, 2008

• xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less

  Show description for 8313374
  gitster

  committed
  8313374

  Copy full SHA for 8313374

• xmerge.c: minimum readability fixups

  Show description for 838338c
  gitster

  committed
  838338c

  Copy full SHA for 838338c

• xdiff-merge: optionally show conflicts in "diff3 -m" style

  Show description for e0af48e
  gitster

  committed
  e0af48e

  Copy full SHA for e0af48e

• xdl_fill_merge_buffer(): separate out a too deeply nested function

  Show description for f2b25dd
  gitster

  committed
  f2b25dd

  Copy full SHA for f2b25dd

Commits on Feb 18, 2008

• xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM

  Show description for ee95ec5
  

  dscho

  authored and

  gitster

  committed
  ee95ec5

  Copy full SHA for ee95ec5

• xdl_merge(): make XDL_MERGE_ZEALOUS output simpler

  Show description for f407f14
  

  dscho

  authored and

  gitster

  committed
  f407f14

  Copy full SHA for f407f14

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

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

Loading