Sign in
googlers
/
jrn
/
git
/
337b4d400023d22207bcc3c29e9ebab31bf96fc2
/
merge-blobs.c
eea0e59
treewide: remove unnecessary includes in source files
by Elijah Newren
· 1 year, 1 month ago
a034e91
object-store-ll.h: split this header out of object-store.h
by Elijah Newren
· 1 year, 8 months ago
6723899
merge-ll: rename from ll-merge
by Elijah Newren
· 1 year, 8 months ago
72871b19
Merge branch 'ab/remove-implicit-use-of-the-repository'
by Junio C Hamano
· 1 year, 9 months ago
bc726bd
cocci: apply the "object-store.h" part of "the_repository.pending"
by Ævar Arnfjörð Bjarmason
· 1 year, 10 months ago
1c02840
object-store.h: move struct object_info from cache.h
by Elijah Newren
· 1 year, 11 months ago
35f6967
ll-merge: make callers responsible for showing warnings
by Elijah Newren
· 3 years ago
f4a55b2
merge-blobs.c: remove implicit dependency on the_index
by Nguyễn Thái Ngọc Duy
· 6 years ago
32eaa46
ll-merge.c: remove implicit dependency on the_index
by Nguyễn Thái Ngọc Duy
· 6 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
18b26b1
Merge branch 'jk/no-diff-emit-common'
by Junio C Hamano
· 9 years ago
b779b3a
merge-tree: drop generate_common strategy
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
d687839
merge-blobs.c: fix a memleak
by Stefan Beller
· 10 years ago
fa2364e
Which merge_file() function do you mean?
by Junio C Hamano
· 12 years ago
[Renamed (94%) from merge-file.c]
1e0f8c4
sparse: Fix an "symbol 'merge_file' not decared" warning
by Ramsay Jones
· 14 years ago
712516b
ll-merge: replace flag argument with options struct
by Jonathan Nieder
· 14 years ago
39b5977
Merge branch 'rs/diff-no-minimal'
by Junio C Hamano
· 15 years ago
582aa00
git diff too slow for a file
by René Scharfe
· 15 years ago
e44b385
merge_file(): add comment explaining behavior wrt conflict style
by Jonathan Nieder
· 15 years ago
f01de62
ll_merge(): add ancestor label parameter for diff3-style output
by Jonathan Nieder
· 15 years ago
15b4f7a
merge-tree: use ll_merge() not xdl_merge()
by Junio C Hamano
· 15 years ago
00f8f97
xdl_merge(): introduce xmparam_t for merge specific parameters
by Junio C Hamano
· 15 years ago
9ccd0a8
Always initialize xpparam_t to 0
by Brian Downing
· 16 years ago
c279d7e
xdl_diff: identify call sites.
by Junio C Hamano
· 17 years ago
30b2501
Future-proof source for changes in xdemitconf_t
by Johannes Schindelin
· 18 years ago
21666f1
convert object type handling from a string to a number
by Nicolas Pitre
· 18 years ago
e2b7008
Get rid of the dependency on RCS' merge program
by Johannes Schindelin
· 18 years ago
9befac4
Replace uses of strdup with xstrdup.
by Shawn Pearce
· 18 years ago
0c79938
Improved three-way blob merging code
by Linus Torvalds
· 19 years ago