index
:
org/kernel/git.git
master
forked from git/git
git
about
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
xdiff
Commit message (
Expand
)
Author
Age
*
Merge branch 'js/ignore-space-at-eol' into maint
Junio C Hamano
2016-08-08
|
\
|
*
diff: fix a double off-by-one with --ignore-space-at-eol
Johannes Schindelin
2016-07-11
*
|
Merge branch 'rs/xdiff-hunk-with-func-line' into maint
Junio C Hamano
2016-06-27
|
\
\
|
*
|
xdiff: fix merging of appended hunk with -W
René Scharfe
2016-06-09
|
*
|
xdiff: -W: don't include common trailing empty lines in context
René Scharfe
2016-05-31
|
*
|
xdiff: ignore empty lines before added functions with -W
René Scharfe
2016-05-31
|
*
|
xdiff: handle appended chunks better with -W
René Scharfe
2016-05-31
|
*
|
xdiff: factor out match_func_rec()
René Scharfe
2016-05-31
*
|
|
Merge branch 'jk/diff-compact-heuristic'
Junio C Hamano
2016-05-06
|
\
\
\
|
*
|
|
xdiff: implement empty line chunk heuristic
Stefan Beller
2016-04-19
|
*
|
|
xdiff: add recs_match helper function
Jacob Keller
2016-04-18
|
|
|
/
|
|
/
|
*
|
|
Merge branch 'rj/xdiff-prepare-plug-leak-on-error-codepath'
Junio C Hamano
2016-04-03
|
\
\
\
|
|
_
|
/
|
/
|
|
|
*
|
xdiff/xprepare: fix a memory leak
Ramsay Jones
2016-03-04
|
*
|
xdiff/xprepare: use the XDF_DIFF_ALG() macro to access flag bits
Ramsay Jones
2016-03-04
|
|
/
*
|
Merge branch 'ps/plug-xdl-merge-leak'
Junio C Hamano
2016-02-26
|
\
\
|
*
|
xdiff/xmerge: fix memory leak in xdl_merge
Patrick Steinhardt
2016-02-23
|
|
/
*
|
Merge branch 'jk/no-diff-emit-common'
Junio C Hamano
2016-02-26
|
\
\
|
*
|
xdiff: drop XDL_EMIT_COMMON
Jeff King
2016-02-22
|
|
/
*
|
merge-file: ensure that conflict sections match eol style
Johannes Schindelin
2016-01-27
*
|
merge-file: let conflict markers match end-of-line style of the context
Johannes Schindelin
2016-01-27
|
/
*
git-merge-file: do not add LF at EOF while applying unrelated change
Max Kirillov
2014-06-30
*
C: have space around && and || operators
Junio C Hamano
2013-10-16
*
diff: add --ignore-blank-lines option
Antoine Pelisse
2013-06-19
*
Correct common spelling mistakes in comments and tests
Stefano Lattarini
2013-04-12
*
Merge branch 'rs/xdiff-fast-hash-fix'
Junio C Hamano
2012-05-25
|
\
|
*
xdiff: import new 32-bit version of count_masked_bytes()
René Scharfe
2012-05-23
|
*
xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines
René Scharfe
2012-05-23
|
*
xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines
René Scharfe
2012-05-22
*
|
xdiff: remove unused functions
René Scharfe
2012-05-09
*
|
xdiff: remove emit_func() and xdi_diff_hunks()
René Scharfe
2012-05-09
*
|
xdiff: add hunk_func()
René Scharfe
2012-05-09
*
|
Merge branch 'tr/xdiff-fast-hash'
Junio C Hamano
2012-05-02
|
\
\
|
|
/
|
*
xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE
Thomas Rast
2012-05-01
|
*
xdiff: load full words in the inner loop of xdl_hash_record
Thomas Rast
2012-04-09
*
|
Merge branch 'jc/diff-algo-cleanup'
Junio C Hamano
2012-04-15
|
\
\
|
|
/
|
/
|
|
*
xdiff: PATIENCE/HISTOGRAM are not independent option bits
Junio C Hamano
2012-02-19
|
*
xdiff: remove XDL_PATCH_* macros
Junio C Hamano
2012-02-19
*
|
Merge branch 'rs/diff-postimage-in-context'
Junio C Hamano
2012-01-29
|
\
\
|
|
/
|
/
|
|
*
xdiff: print post-image for common records instead of pre-image
René Scharfe
2012-01-06
*
|
Merge branch 'rs/diff-whole-function'
Junio C Hamano
2011-10-19
|
\
\
|
*
|
diff: add option to show whole functions as context
René Scharfe
2011-10-10
|
*
|
xdiff: factor out get_func_line()
René Scharfe
2011-10-10
*
|
|
Merge branch 'rs/diff-cleanup-records-fix'
Junio C Hamano
2011-10-13
|
\
\
\
|
|
/
/
|
/
|
|
|
*
|
Revert removal of multi-match discard heuristic in 27af01
René Scharfe
2011-09-26
*
|
|
Merge branch 'rc/histogram-diff'
Junio C Hamano
2011-09-06
|
\
\
\
|
*
|
|
xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
Tay Ray Chuan
2011-08-31
*
|
|
|
Merge branch 'rc/histogram-diff' into HEAD
Junio C Hamano
2011-08-17
|
\
\
\
\
|
|
/
/
/
|
|
/
/
|
|
/
/
|
/
|
|
|
*
|
xdiff/xhistogram: drop need for additional variable
Tay Ray Chuan
2011-08-08
|
*
|
xdiff/xhistogram: rely on xdl_trim_ends()
Tay Ray Chuan
2011-08-08
|
*
|
xdiff/xhistogram: rework handling of recursed results
Tay Ray Chuan
2011-08-08
[next]
