16 Commits (0c3473561610ac9f94c65f64178d2a66ee73eb64)

Author SHA1 Message Date
Junio C Hamano ba19a808aa Drop double-semicolon in C 16 years ago
Alex Riesen 47d32af233 Make some of fwrite/fclose/write/close failures visible 16 years ago
Alex Riesen a4f34cbb4c Use git_pathdup instead of xstrdup(git_path(...)) 16 years ago
Junio C Hamano acd3b9eca8 Enhance hold_lock_file_for_{update,append}() API 16 years ago
Brandon Casey f285a2d7ed Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 16 years ago
Nicolas Pitre 9126f0091f fix openssl headers conflicting with custom SHA1 implementations 16 years ago
Junio C Hamano 90b4a71c49 is_directory(): a generic helper function 17 years ago
Junio C Hamano 387c9d4981 rerere: understand "diff3 -m" style conflicts with the original 17 years ago
Junio C Hamano cc58d7dfdd rerere.c: use symbolic constants to keep track of parsing states 17 years ago
Johannes Schindelin c455c87c5c Rename path_list to string_list 17 years ago
Junio C Hamano 9196e82587 rerere.autoupdate: change the message when autoupdate is in effect 17 years ago
Stephan Beyer 5b2fd95606 rerere: Separate libgit and builtin functions 17 years ago
Olivier Marin 99d698f1e7 builtin-rerere: more carefully find conflict markers 17 years ago
Junio C Hamano 121c813f8d rerere.autoupdate 17 years ago
Junio C Hamano 51e0d0a67b rerere: remove dubious "tail_optimization" 17 years ago
Junio C Hamano a1b32fdc3d git-rerere: detect unparsable conflicts 17 years ago
Junio C Hamano 9022a495a3 rerere: rerere_created_at() and has_resolution() abstraction 17 years ago
Junio C Hamano 1a8fb155cf builtin-rerere: fix a small leak 17 years ago
Johannes Schindelin ef90d6d420 Provide git_config with a callback-data parameter 17 years ago
Daniel Barkalow 1468bd4783 Use a single implementation and API for copy_file() 17 years ago
Linus Torvalds 7a51ed66f6 Make on-disk index representation separate from in-core one 17 years ago
Brandon Casey 4ed7cd3ab0 Improve use of lockfile API 17 years ago
Junio C Hamano c279d7e986 xdl_diff: identify call sites. 17 years ago
Kristian Høgsberg d8b7db0abf Export rerere() and launch_editor(). 18 years ago
Junio C Hamano b4833a2c62 rerere: Fix use of an empty strbuf.buf 18 years ago
Pierre Habouzit 8289b62095 Make builtin-rerere use of strbuf nicer and more efficient. 18 years ago
Pierre Habouzit ba3ed09728 Now that cache.h needs strbuf.h, remove useless includes. 18 years ago
Pierre Habouzit f1696ee398 Strbuf API extensions and fixes. 18 years ago
Pierre Habouzit 19b358e8da Use strbuf API in buitin-rerere.c 18 years ago
Peter Hagervall baffc0e770 Make every builtin-*.c file #include "builtin.h" 18 years ago
Johannes Schindelin 52aaf649cb rerere: record resolution even if file is not in merge base 18 years ago
Johannes Schindelin b4372ef136 Enable "git rerere" by the config variable rerere.enabled 18 years ago
Johannes Schindelin 30b250104d Future-proof source for changes in xdemitconf_t 18 years ago
Jim Meyering 91c8d5905c detect close failure on just-written file handles 18 years ago
Junio C Hamano a6080a0a44 War on whitespace 18 years ago
Junio C Hamano 2b93edbf32 rerere: make sorting really stable. 18 years ago
Junio C Hamano eb3359663d rerere should not repeat the earlier hunks in later ones 18 years ago
Junio C Hamano 1289172749 rerere: do not deal with symlinks. 18 years ago
Junio C Hamano ab242f809a rerere: do not skip two conflicted paths next to each other. 18 years ago
Junio C Hamano 599065a3bb prefixcmp(): fix-up mechanical conversion. 18 years ago
Junio C Hamano cc44c7655f Mechanical conversion to use prefixcmp() 18 years ago
Andy Whitcroft 93822c2239 short i/o: fix calls to write to use xwrite or write_in_full 18 years ago
Junio C Hamano 3a2d3e8678 rerere: Fix removal of already resolved path. 18 years ago
Junio C Hamano 48c3242450 rerere gc: honor configuration and document it 18 years ago
Johannes Schindelin 658f365027 Make git-rerere a builtin 18 years ago