Sign in
googlers
/
jrn
/
git
/
4f09825e58ce1da7af8cc96bff5a6b118790fffa
/
xdiff
ba31180
git-merge-file: do not add LF at EOF while applying unrelated change
by Max Kirillov
· 11 years ago
c01499e
C: have space around && and || operators
by Junio C Hamano
· 11 years ago
36617af
diff: add --ignore-blank-lines option
by Antoine Pelisse
· 12 years ago
41ccfdd
Correct common spelling mistakes in comments and tests
by Stefano Lattarini
· 12 years ago
0bc8bea
Merge branch 'rs/xdiff-fast-hash-fix'
by Junio C Hamano
· 13 years ago
8072766
xdiff: import new 32-bit version of count_masked_bytes()
by René Scharfe
· 13 years ago
7e356a9
xdiff: avoid more compiler warnings with XDL_FAST_HASH on 32-bit machines
by René Scharfe
· 13 years ago
9322ce2
xdiff: avoid compiler warnings with XDL_FAST_HASH on 32-bit machines
by René Scharfe
· 13 years ago
be89977
xdiff: remove unused functions
by René Scharfe
· 13 years ago
3319e60
xdiff: remove emit_func() and xdi_diff_hunks()
by René Scharfe
· 13 years ago
467d348
xdiff: add hunk_func()
by René Scharfe
· 13 years ago
4d1f0ef
Merge branch 'tr/xdiff-fast-hash'
by Junio C Hamano
· 13 years ago
6f1af02
xdiff: choose XDL_FAST_HASH code on sizeof(long) instead of __WORDSIZE
by Thomas Rast
· 13 years ago
86c340e
Merge branch 'jc/diff-algo-cleanup'
by Junio C Hamano
· 13 years ago
6942efc
xdiff: load full words in the inner loop of xdl_hash_record
by Thomas Rast
· 13 years ago
307ab20
xdiff: PATIENCE/HISTOGRAM are not independent option bits
by Junio C Hamano
· 13 years ago
e5b0662
xdiff: remove XDL_PATCH_* macros
by Junio C Hamano
· 13 years ago
86e15ff
Merge branch 'rs/diff-postimage-in-context'
by Junio C Hamano
· 13 years ago
baf5aaa
xdiff: print post-image for common records instead of pre-image
by René Scharfe
· 13 years ago
9b55aa0
Merge branch 'rs/diff-whole-function'
by Junio C Hamano
· 13 years ago
7a63a92
Merge branch 'rs/diff-cleanup-records-fix'
by Junio C Hamano
· 13 years ago
14937c2
diff: add option to show whole functions as context
by René Scharfe
· 13 years ago
f99f4b3
xdiff: factor out get_func_line()
by René Scharfe
· 13 years ago
c5aa906
Revert removal of multi-match discard heuristic in 27af01
by René Scharfe
· 13 years ago
b648557
Merge branch 'rc/histogram-diff'
by Junio C Hamano
· 13 years ago
2738bc3
xdiff/xprepare: initialise xdlclassifier_t cf in xdl_prepare_env()
by Tay Ray Chuan
· 13 years ago
b14b969
Merge branch 'rc/histogram-diff' into HEAD
by Junio C Hamano
· 14 years ago
27af01d
xdiff/xprepare: improve O(n*m) performance in xdl_cleanup_records()
by Tay Ray Chuan
· 14 years ago
6486a84
xdiff/xhistogram: drop need for additional variable
by Tay Ray Chuan
· 14 years ago
43ca753
xdiff/xhistogram: rely on xdl_trim_ends()
by Tay Ray Chuan
· 14 years ago
19f7a9c
xdiff/xhistogram: rework handling of recursed results
by Tay Ray Chuan
· 14 years ago
739864b
xdiff: do away with xdl_mmfile_next()
by Tay Ray Chuan
· 14 years ago
86abba8
xdiff/xprepare: use a smaller sample size for histogram diff
by Tay Ray Chuan
· 14 years ago
9f37c27
xdiff/xprepare: skip classification
by Tay Ray Chuan
· 14 years ago
8c912ee
teach --histogram to diff
by Tay Ray Chuan
· 14 years ago
1d26b25
xdiff/xpatience: factor out fall-back-diff function
by Tay Ray Chuan
· 14 years ago
159607a
xdiff/xprepare: refactor abort cleanups
by Tay Ray Chuan
· 14 years ago
452f4fa
xdiff/xprepare: use memset()
by Tay Ray Chuan
· 14 years ago
8cf666c
Merge branch 'cb/diff-fname-optim'
by Junio C Hamano
· 14 years ago
349362c
xdiff: cast arguments for ctype functions to unsigned char
by Jonathan Nieder
· 14 years ago
c099789
diff: avoid repeated scanning while looking for funcname
by René Scharfe
· 14 years ago
b4cf0f1
xdiff: optimise for no whitespace difference when ignoring whitespace.
by Dylan Reid
· 15 years ago
c8c073c
xdiff/xmerge.c: use memset() instead of explicit for-loop
by Alexey Mahotkin
· 15 years ago
a4b5e91
xdl_merge(): move file1 and file2 labels to xmparam structure
by Jonathan Nieder
· 15 years ago
8a16143
xdl_merge(): add optional ancestor label to diff3-style output
by Jonathan Nieder
· 15 years ago
560119b
refactor merge flags into xmparam_t
by Bert Wesarg
· 15 years ago
cd1d61c
make union merge an xdl merge favor
by Bert Wesarg
· 15 years ago
06dbc1e
Merge branch 'jc/conflict-marker-size'
by Junio C Hamano
· 15 years ago
9914cf4
xdl_merge(): allow passing down marker_size in xmparam_t
by Junio C Hamano
· 15 years ago
00f8f97
xdl_merge(): introduce xmparam_t for merge specific parameters
by Junio C Hamano
· 15 years ago
73eb40e
git-merge-file --ours, --theirs
by Junio C Hamano
· 17 years ago
d34eca0
Merge branch 'tf/diff-whitespace-incomplete-line'
by Junio C Hamano
· 15 years ago
3b5ef0e
xutils: Fix xdl_recmatch() on incomplete lines
by Junio C Hamano
· 15 years ago
78ed710
xutils: Fix hashing an incomplete line with whitespaces at the end
by Junio C Hamano
· 15 years ago
f630cfd
refactor: use bitsizeof() instead of 8 * sizeof()
by Pierre Habouzit
· 16 years ago
456cb4c
Merge branch 'cb/maint-1.6.0-xdl-merge-fix' into maint
by Junio C Hamano
· 16 years ago
5719db9
Change xdl_merge to generate output even for null merges
by Charles Bailey
· 16 years ago
3ea3c21
Fix typos / spelling in comments
by Mike Ralphson
· 16 years ago
8e24cba
Fix various dead stores found by the clang static analyzer
by Benjamin Kramer
· 16 years ago
8c4c286
Merge branch 'kc/maint-diff-bwi-fix' into maint
by Junio C Hamano
· 16 years ago
5dc1308
Merge branch 'js/patience-diff'
by Junio C Hamano
· 16 years ago
9a01387
Merge branch 'kc/maint-diff-bwi-fix'
by Junio C Hamano
· 16 years ago
6d12ace
Fix combined use of whitespace ignore options to diff
by Keith Cascio
· 16 years ago
92b7de9
Implement the patience diff algorithm
by Johannes Schindelin
· 16 years ago
6d0e674
diff: add option to show context between close hunks
by René Scharfe
· 16 years ago
733070b
xdiff: give up scanning similar lines early
by Davide Libenzi
· 16 years ago
ac2abb4
Merge branch 'dl/xdiff'
by Junio C Hamano
· 16 years ago
9b28d55
xdiff: give up scanning similar lines early
by Davide Libenzi
· 16 years ago
ef2e62f
Allow alternate "low-level" emit function from xdl_diff
by Brian Downing
· 16 years ago
8313374
xmerge.c: "diff3 -m" style clips merge reduction level to EAGER or less
by Junio C Hamano
· 16 years ago
838338c
xmerge.c: minimum readability fixups
by Junio C Hamano
· 16 years ago
e0af48e
xdiff-merge: optionally show conflicts in "diff3 -m" style
by Junio C Hamano
· 16 years ago
f2b25dd
xdl_fill_merge_buffer(): separate out a too deeply nested function
by Junio C Hamano
· 16 years ago
ee95ec5
xdl_merge(): introduce XDL_MERGE_ZEALOUS_ALNUM
by Johannes Schindelin
· 17 years ago
f407f14
xdl_merge(): make XDL_MERGE_ZEALOUS output simpler
by Johannes Schindelin
· 17 years ago
a777e9c
Remove unreachable statements
by Guido Ostkamp
· 17 years ago
f258475
Per-path attribute based hunk header selection.
by Junio C Hamano
· 18 years ago
52fae7d
Missing statics.
by Pierre Habouzit
· 18 years ago
a6080a0
War on whitespace
by Junio C Hamano
· 18 years ago
824f782
xdiff/xutils.c(xdl_hash_record): factor out whitespace handling
by Johannes Schindelin
· 18 years ago
859f9c4
teach diff machinery about --ignore-space-at-eol
by Johannes Schindelin
· 18 years ago
22b6abc
Fix yet another subtle xdl_merge() bug
by Johannes Schindelin
· 18 years ago
5d6b151
xdl_merge(): fix a segmentation fault when refining conflicts
by Johannes Schindelin
· 18 years ago
8042ed1
Merge branch 'master' into js/merge
by Junio C Hamano
· 18 years ago
98e6da8
xdl_merge(): fix and simplify conflict handling
by Johannes Schindelin
· 18 years ago
c7c2488
diff -b: ignore whitespace at end of line
by Johannes Schindelin
· 18 years ago
710daa8
xdl_merge(): fix thinko
by Johannes Schindelin
· 18 years ago
875b8ce
xdl_merge(): fix an off-by-one bug
by Johannes Schindelin
· 18 years ago
53a7085
xmerge: make return value from xdl_merge() more usable.
by Junio C Hamano
· 18 years ago
857b933
xdiff: add xdl_merge()
by Johannes Schindelin
· 18 years ago
f73da29
Increase length of function name buffer
by Andy Parkins
· 18 years ago
70da769
xdiff: Match GNU diff behaviour when deciding hunk comment worthiness of lines
by Petr Baudis
· 18 years ago
67aef03
xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
by Jim Meyering
· 18 years ago
3453f86
Merge branch 'maint'
by Junio C Hamano
· 18 years ago
9de0834
Fix hash function in xdiff library
by Linus Torvalds
· 18 years ago
v1.4.2.4
2344d47
diff: fix 2 whitespace issues
by Johannes Schindelin
· 18 years ago
096b173
Merge branch 'lt/merge-tree'
by Junio C Hamano
· 19 years ago
82e5a82
Fix more typos, primarily in the code
by Pavel Roskin
· 19 years ago
a9ed376
xdiff: generate "anti-diffs" aka what is common to two files
by Linus Torvalds
· 19 years ago
0d21efa
Teach diff about -b and -w flags
by Johannes Schindelin
· 19 years ago
Next »