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
/
xdiff.h
Age
Commit message (
Expand
)
Author
2012-05-10
xdiff: remove emit_func() and xdi_diff_hunks()
René Scharfe
2012-05-10
xdiff: add hunk_func()
René Scharfe
2012-02-20
xdiff: PATIENCE/HISTOGRAM are not independent option bits
Junio C Hamano
2012-02-20
xdiff: remove XDL_PATCH_* macros
Junio C Hamano
2011-10-10
diff: add option to show whole functions as context
René Scharfe
2011-08-03
xdiff: do away with xdl_mmfile_next()
Tay Ray Chuan
2011-07-12
teach --histogram to diff
Tay Ray Chuan
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-01-24
Merge branch 'js/patience-diff'
Junio C Hamano
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-10-25
Allow alternate "low-level" emit function from xdl_diff
Brian Downing
2008-08-31
xdiff-merge: optionally show conflicts in "diff3 -m" style
Junio C Hamano
2008-02-18
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
Johannes Schindelin
2007-07-06
Per-path attribute based hunk header selection.
Junio C Hamano
2007-06-07
War on whitespace
Junio C Hamano
2007-02-14
teach diff machinery about --ignore-space-at-eol
Johannes Schindelin
2006-12-03
xdiff: add xdl_merge()
Johannes Schindelin
2006-06-29
xdiff: generate "anti-diffs" aka what is common to two files
Linus Torvalds
2006-06-24
Teach diff about -b and -w flags
Johannes Schindelin
2006-03-28
xdiff: Show function names in hunk headers.
Mark Wooding
2006-03-26
Use a *real* built-in diff generator
Linus Torvalds