Sign in
googlers
/
jrn
/
git
/
5459bc1bbb54536df18b034afd390f899bda37be
/
combine-diff.c
4da281e
Merge branch 'ab/pickaxe-pcre2'
by Junio C Hamano
· 3 years, 8 months ago
a8d5eb6
xdiff-interface: prepare for allowing early return
by Ævar Arnfjörð Bjarmason
· 4 years ago
1422844
hash: provide per-algorithm null OIDs
by brian m. carlson
· 3 years, 11 months ago
ca56dad
use CALLOC_ARRAY
by René Scharfe
· 4 years ago
7da656f
Merge branch 'jk/diff-cc-oidfind-fix'
by Junio C Hamano
· 4 years, 5 months ago
957876f
combine-diff: handle --find-object in multitree code path
by Jeff King
· 4 years, 5 months ago
d01141d
diff: get rid of redundant 'dense' argument
by Sergey Organov
· 4 years, 5 months ago
fe299ec
oid_array: rename source file from sha1-array
by Jeff King
· 5 years ago
976ff7e
combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo
by brian m. carlson
· 6 years ago
c425d36
Merge branch 'en/combined-all-paths'
by Junio C Hamano
· 6 years ago
d76ce4f
log,diff-tree: add --combined-all-paths option
by Elijah Newren
· 6 years ago
5d2710b
Merge branch 'jk/diff-cc-stat-fixes'
by Junio C Hamano
· 6 years ago
dac03b5
combine-diff: treat --dirstat like --stat
by Jeff King
· 6 years ago
04b19fc
combine-diff: treat --summary like --stat
by Jeff King
· 6 years ago
8290faa
combine-diff: treat --shortstat like --stat
by Jeff King
· 6 years ago
8817f0c
combine-diff: factor out stat-format mask
by Jeff King
· 6 years ago
cde5554
Merge branch 'nd/the-index'
by Junio C Hamano
· 6 years ago
39d23df
Merge branch 'jk/xdiff-interface'
by Junio C Hamano
· 6 years ago
bd7ad45
notes-cache.c: remove the_repository references
by Nguyễn Thái Ngọc Duy
· 6 years ago
0074c91
combine-diff: use an xdiff hunk callback
by Jeff King
· 6 years ago
9346d6d
xdiff-interface: provide a separate consume callback for hunks
by Jeff King
· 6 years ago
11877b9
Merge branch 'nd/the-index'
by Junio C Hamano
· 6 years ago
acd00ea
userdiff.c: remove implicit dependency on the_index
by Nguyễn Thái Ngọc Duy
· 6 years ago
6afaf80
diff.c: remove the_index dependency in textconv() functions
by Nguyễn Thái Ngọc Duy
· 6 years ago
0734f20
combine-diff.c: remove implicit dependency on the_index
by Nguyễn Thái Ngọc Duy
· 6 years ago
4a7e27e
convert "oidcmp() == 0" to oideq()
by Jeff King
· 7 years ago
cbd53a2
object-store: move object access functions to object-store.h
by Stefan Beller
· 7 years ago
b4f5aca
sha1_file: convert read_sha1_file to struct object_id
by brian m. carlson
· 7 years ago
aab9583
Convert find_unique_abbrev* to struct object_id
by brian m. carlson
· 7 years ago
169c9c0
Merge branch 'bw/c-plus-plus'
by Junio C Hamano
· 7 years ago
06fffa0
combine-diff: rename 'new' variables
by Brandon Williams
· 7 years ago
9bc89b1
Merge branch 'tb/crlf-conv-flags'
by Junio C Hamano
· 7 years ago
8462ff4
convert_to_git(): safe_crlf/checksafe becomes int conv_flags
by Torsten Bögershausen
· 7 years ago
cf63051
diff: introduce DIFF_PICKAXE_KINDS_MASK
by Stefan Beller
· 7 years ago
8cc6332
Merge branch 'bw/diff-opt-impl-to-bitfields'
by Junio C Hamano
· 7 years ago
0d1e0e7
diff: make struct diff_flags members lowercase
by Brandon Williams
· 7 years ago
b2100e5
diff: remove DIFF_OPT_CLR macro
by Brandon Williams
· 7 years ago
23dcf77
diff: remove DIFF_OPT_SET macro
by Brandon Williams
· 7 years ago
3b69dae
diff: remove DIFF_OPT_TST macro
by Brandon Williams
· 7 years ago
a98e610
refs: convert resolve_gitlink_ref to struct object_id
by brian m. carlson
· 7 years ago
5812b3f
Merge branch 'bw/ls-files-sans-the-index'
by Junio C Hamano
· 8 years ago
82b474e
convert: convert convert_to_git to take an index
by Brandon Williams
· 8 years ago
fda94b4
tree-diff: convert diff_tree_paths to struct object_id
by Brandon Williams
· 8 years ago
66f414f
diff-tree: convert diff_tree_sha1 to struct object_id
by Brandon Williams
· 8 years ago
09fae19
combine-diff: convert find_paths_* to struct object_id
by Brandon Williams
· 8 years ago
b9acf54
combine-diff: convert diff_tree_combined to struct object_id
by Brandon Williams
· 8 years ago
f9704c2
diff: convert fill_filespec to struct object_id
by Brandon Williams
· 8 years ago
b1081e4
Merge branch 'bc/object-id'
by Junio C Hamano
· 8 years ago
910650d
Rename sha1_array to oid_array
by brian m. carlson
· 8 years ago
98a72dd
Make sha1_array_append take a struct object_id *
by brian m. carlson
· 8 years ago
0dc3b03
combine-diff: replace malloc/snprintf with xstrfmt
by Jeff King
· 8 years ago
ee3051b
sha1-array: convert internal storage for struct sha1_array to object_id
by brian m. carlson
· 8 years ago
d6cece5
diff_aligned_abbrev: use "struct oid"
by Jeff King
· 8 years ago
d5e3b01
diff_unique_abbrev: rename to diff_aligned_abbrev
by Jeff King
· 8 years ago
a63d31b
Merge branch 'bc/cocci'
by Junio C Hamano
· 9 years ago
41c9560
diff: rename struct diff_filespec's sha1_valid member
by brian m. carlson
· 9 years ago
a0d12c4
diff: convert struct diff_filespec to struct object_id
by brian m. carlson
· 9 years ago
ed6e803
pathspec: rename free_pathspec() to clear_pathspec()
by Junio C Hamano
· 9 years ago
4b94ec9
combine-diff.c: use error_errno()
by Nguyễn Thái Ngọc Duy
· 9 years ago
50a6c8e
use st_add and st_mult for allocation size computation
by Jeff King
· 9 years ago
96ffc06
convert trivial cases to FLEX_ARRAY macros
by Jeff King
· 9 years ago
3733e69
use xmallocz to avoid size arithmetic
by Jeff King
· 9 years ago
b32fa95
convert trivial cases to ALLOC_ARRAY
by Jeff King
· 9 years ago
ed1c997
Remove get_object_hash.
by brian m. carlson
· 9 years ago
7999b2c
Add several uses of get_object_hash.
by brian m. carlson
· 9 years ago
11a458b
Sync with 2.4.10
by Junio C Hamano
· 9 years ago
6343e2f
Sync with 2.3.10
by Junio C Hamano
· 9 years ago
3efb988
react to errors in xdi_diff
by Jeff King
· 9 years ago
db65170
Merge branch 'jk/color-diff-plain-is-context'
by Junio C Hamano
· 10 years ago
8dbf3eb
diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
by Jeff King
· 10 years ago
1ff57c1
diff: convert struct combine_diff_path to object_id
by brian m. carlson
· 10 years ago
44ceb79
Merge branch 'jk/pretty-empty-format'
by Junio C Hamano
· 11 years ago
4109c28
Merge branch 'jk/diff-tree-t-fix'
by Junio C Hamano
· 11 years ago
e09867f
intersect_paths: respect mode in git's tree-sort
by Jeff King
· 11 years ago
b9c7d6e
pretty: make empty userformats truly empty
by Jeff King
· 11 years ago
e7cc0ed
Merge branch 'mk/show-s-no-extra-blank-line-for-merges'
by Junio C Hamano
· 11 years ago
ad2f725
git-show: fix 'git show -s' to not add extra terminator after merge commit
by Max Kirillov
· 11 years ago
7195fbf
combine-diff: speed it up, by using multiparent diff tree-walker directly
by Kirill Smelkov
· 11 years ago
eeb3f32
combine-diff: move changed-paths scanning logic into its own function
by Kirill Smelkov
· 11 years ago
51af188
combine-diff: move show_log_first logic/action out of paths scanning
by Kirill Smelkov
· 11 years ago
7b1004b
combine-diff: simplify intersect_paths() further
by Junio C Hamano
· 11 years ago
af82c78
combine-diff: combine_diff_path.len is not needed anymore
by Kirill Smelkov
· 11 years ago
8518ff8
combine-diff: optimize combine_diff_path sets intersection
by Kirill Smelkov
· 11 years ago
b02f5ae
Merge branch 'jl/submodule-mv'
by Junio C Hamano
· 12 years ago
4ab4a6d
Merge branch 'tr/log-full-diff-keep-true-parents'
by Junio C Hamano
· 12 years ago
53d00b3
log: use true parents for diff even when rewriting
by Thomas Rast
· 12 years ago
98e023d
many small typofixes
by Ondřej Bílka
· 12 years ago
bd1928d
remove diff_tree_{setup,release}_paths
by Nguyễn Thái Ngọc Duy
· 12 years ago
a1ddd11
Merge branch 'cb/log-follow-with-combined'
by Junio C Hamano
· 12 years ago
edc7f0a
Merge branch 'mk/combine-diff-context-horizon-fix'
by Junio C Hamano
· 12 years ago
46ec510
fix segfault with git log -c --follow
by Clemens Buchacher
· 12 years ago
aac3857
combine-diff.c: Fix output when changes are exactly 3 lines apart
by Matthijs Kooijman
· 12 years ago
99d3206
combine-diff: coalesce lost lines optimally
by Antoine Pelisse
· 12 years ago
fa04ae0
Allow combined diff to ignore white-spaces
by Antoine Pelisse
· 12 years ago
a1d68be
Merge branch 'jk/diff-graph-cleanup'
by Junio C Hamano
· 12 years ago
41ee2ad
combine-diff.c: teach combined diffs about line prefix
by John Keeping
· 12 years ago
7766705
combine-diff: lift 32-way limit of combined diff
by Junio C Hamano
· 12 years ago
03adeea
Merge branch 'jk/maint-null-in-trees' into maint-1.7.11
by Junio C Hamano
· 13 years ago
3b75314
Merge branch 'jk/maint-null-in-trees'
by Junio C Hamano
· 13 years ago
e545010
diff: do not use null sha1 as a sentinel value
by Jeff King
· 13 years ago
Next »