Commit Graph

11 Commits (master)

Author SHA1 Message Date
Elijah Newren 35f6967161 ll-merge: make callers responsible for showing warnings 8 months ago
Nguyễn Thái Ngọc Duy f4a55b2797 merge-blobs.c: remove implicit dependency on the_index 4 years ago
Nguyễn Thái Ngọc Duy 32eaa46883 ll-merge.c: remove implicit dependency on the_index 4 years ago
Stefan Beller cbd53a2193 object-store: move object access functions to object-store.h 4 years ago
brian m. carlson b4f5aca40e sha1_file: convert read_sha1_file to struct object_id 5 years ago
Jeff King b779b3a199 merge-tree: drop generate_common strategy 7 years ago
brian m. carlson ed1c9977cb Remove get_object_hash. 7 years ago
brian m. carlson 7999b2cf77 Add several uses of get_object_hash. 7 years ago
Stefan Beller d687839c29 merge-blobs.c: fix a memleak 8 years ago
Junio C Hamano fa2364ec34 Which merge_file() function do you mean? 10 years ago
Ramsay Jones 1e0f8c41ac sparse: Fix an "symbol 'merge_file' not decared" warning 12 years ago
Jonathan Nieder 712516bcac ll-merge: replace flag argument with options struct 12 years ago
René Scharfe 582aa00bdf git diff too slow for a file 13 years ago
Jonathan Nieder e44b3851c9 merge_file(): add comment explaining behavior wrt conflict style 13 years ago
Jonathan Nieder f01de62e45 ll_merge(): add ancestor label parameter for diff3-style output 13 years ago
Junio C Hamano 15b4f7a68d merge-tree: use ll_merge() not xdl_merge() 13 years ago
Junio C Hamano 00f8f97d30 xdl_merge(): introduce xmparam_t for merge specific parameters 13 years ago
Brian Downing 9ccd0a88ac Always initialize xpparam_t to 0 14 years ago
Junio C Hamano c279d7e986 xdl_diff: identify call sites. 15 years ago
Johannes Schindelin 30b250104d Future-proof source for changes in xdemitconf_t 15 years ago
Nicolas Pitre 21666f1aae convert object type handling from a string to a number 16 years ago
Johannes Schindelin e2b7008752 Get rid of the dependency on RCS' merge program 16 years ago
Shawn Pearce 9befac470b Replace uses of strdup with xstrdup. 16 years ago
Linus Torvalds 0c7993839b Improved three-way blob merging code 17 years ago