Welcome to
mirror list
, hosted at
ThFree Co
, Russian Federation.
git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
index
:
git.kernel.org/pub/scm/git/git.git
main
maint
master
next
seen
todo
Unnamed repository; edit this file 'description' to name the repository.
root
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
xdiff
Age
Commit message (
Expand
)
Author
2010-03-21
xdl_merge(): move file1 and file2 labels to xmparam structure
Jonathan Nieder
2010-03-21
xdl_merge(): add optional ancestor label to diff3-style output
Jonathan Nieder
2010-03-02
refactor merge flags into xmparam_t
Bert Wesarg
2010-03-02
make union merge an xdl merge favor
Bert Wesarg
2010-01-21
Merge branch 'jc/conflict-marker-size'
Junio C Hamano
2010-01-17
xdl_merge(): allow passing down marker_size in xmparam_t
Junio C Hamano
2010-01-17
xdl_merge(): introduce xmparam_t for merge specific parameters
Junio C Hamano
2009-11-30
git-merge-file --ours, --theirs
Junio C Hamano
2009-09-01
Merge branch 'tf/diff-whitespace-incomplete-line'
Junio C Hamano
2009-08-24
xutils: Fix xdl_recmatch() on incomplete lines
Junio C Hamano
2009-08-24
xutils: Fix hashing an incomplete line with whitespaces at the end
Junio C Hamano
2009-07-23
refactor: use bitsizeof() instead of 8 * sizeof()
Pierre Habouzit
2009-06-02
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
Junio C Hamano
2009-05-25
Change xdl_merge to generate output even for null merges
Charles Bailey
2009-04-23
Fix typos / spelling in comments
Mike Ralphson
2009-03-16
Fix various dead stores found by the clang static analyzer
Benjamin Kramer
2009-02-06
Merge branch 'kc/maint-diff-bwi-fix' into maint
Junio C Hamano
2009-01-24
Merge branch 'js/patience-diff'
Junio C Hamano
2009-01-22
Merge branch 'kc/maint-diff-bwi-fix'
Junio C Hamano
2009-01-20
Fix combined use of whitespace ignore options to diff
Keith Cascio
2009-01-08
Implement the patience diff algorithm
Johannes Schindelin
2008-12-29
diff: add option to show context between close hunks
René Scharfe
2008-12-03
xdiff: give up scanning similar lines early
Davide Libenzi
2008-11-13
Merge branch 'dl/xdiff'
Junio C Hamano
2008-11-08
xdiff: give up scanning similar lines early
Davide Libenzi
2008-10-25
Allow alternate "low-level" emit function from xdl_diff
Brian Downing
2008-08-31
xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
Junio C Hamano
2008-08-31
xmerge.c: minimum readability fixups
Junio C Hamano
2008-08-31
xdiff-merge: optionally show conflicts in "diff3 -m" style
Junio C Hamano
2008-08-31
xdl_fill_merge_buffer(): separate out a too deeply nested function
Junio C Hamano
2008-02-18
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
Johannes Schindelin
2008-02-18
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
Johannes Schindelin
2007-11-16
Remove unreachable statements
Guido Ostkamp
2007-07-06
Per-path attribute based hunk header selection.
Junio C Hamano
2007-06-08
Missing statics.
Pierre Habouzit
2007-06-07
War on whitespace
Junio C Hamano
2007-03-20
xdiff/xutils.c(xdl_hash_record): factor out whitespace handling
Johannes Schindelin
2007-02-14
teach diff machinery about --ignore-space-at-eol
Johannes Schindelin
2006-12-31
Fix yet another subtle xdl_merge() bug
Johannes Schindelin
2006-12-29
xdl_merge(): fix a segmentation fault when refining conflicts
Johannes Schindelin
2006-12-13
Merge branch 'master' into js/merge
Junio C Hamano
2006-12-06
xdl_merge(): fix and simplify conflict handling
Johannes Schindelin
2006-12-05
diff -b: ignore whitespace at end of line
Johannes Schindelin
2006-12-03
xdl_merge(): fix thinko
Johannes Schindelin
2006-12-03
xdl_merge(): fix an off-by-one bug
Johannes Schindelin
2006-12-03
xmerge: make return value from xdl_merge() more usable.
Junio C Hamano
2006-12-03
xdiff: add xdl_merge()
Johannes Schindelin
2006-11-24
Increase length of function name buffer
Andy Parkins
2006-10-25
xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
Petr Baudis
2006-10-24
xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
Jim Meyering
[next]