summaryrefslogtreecommitdiff
path: root/builtin-rerere.c
AgeCommit message (Expand)AuthorFilesLines
2009-01-11add is_dot_or_dotdot inline functionLibravatar Alexander Potashev1-6/+5
2008-10-25Always initialize xpparam_t to 0Libravatar Brian Downing1-0/+1
2008-07-21Rename path_list to string_listLibravatar Johannes Schindelin1-10/+10
2008-07-16Merge branch 'sb/dashless'Libravatar Junio C Hamano1-1/+1
2008-07-13Make usage strings dash-lessLibravatar Stephan Beyer1-1/+1
2008-07-10rerere: Separate libgit and builtin functionsLibravatar Stephan Beyer1-354/+18
2008-07-10builtin-rerere: more carefully find conflict markersLibravatar Olivier Marin1-3/+13
2008-06-22rerere.autoupdateLibravatar Junio C Hamano1-0/+37
2008-06-22rerere: remove dubious "tail_optimization"Libravatar Junio C Hamano1-10/+9
2008-06-22git-rerere: detect unparsable conflictsLibravatar Junio C Hamano1-0/+5
2008-06-22rerere: rerere_created_at() and has_resolution() abstractionLibravatar Junio C Hamano1-31/+26
2008-06-17builtin-rerere: fix a small leakLibravatar Junio C Hamano1-1/+1
2008-05-14Provide git_config with a callback-data parameterLibravatar Johannes Schindelin1-3/+3
2008-02-26Merge branch 'maint'Libravatar Junio C Hamano1-18/+1
2008-02-25Use a single implementation and API for copy_file()Libravatar Daniel Barkalow1-18/+1
2008-01-21Make on-disk index representation separate from in-core oneLibravatar Linus Torvalds1-2/+2
2008-01-16Improve use of lockfile APILibravatar Brandon Casey1-2/+2
2007-12-13xdl_diff: identify call sites.Libravatar Junio C Hamano1-1/+1
2007-09-27Export rerere() and launch_editor().Libravatar Kristian Høgsberg1-5/+26
2007-09-26rerere: Fix use of an empty strbuf.bufLibravatar Junio C Hamano1-2/+4
2007-09-26Make builtin-rerere use of strbuf nicer and more efficient.Libravatar Pierre Habouzit1-25/+18
2007-09-16Now that cache.h needs strbuf.h, remove useless includes.Libravatar Pierre Habouzit1-1/+0
2007-09-10Strbuf API extensions and fixes.Libravatar Pierre Habouzit1-2/+2
2007-09-06Use strbuf API in buitin-rerere.cLibravatar Pierre Habouzit1-38/+18
2007-07-14Make every builtin-*.c file #include "builtin.h"Libravatar Peter Hagervall1-0/+1
2007-07-09rerere: record resolution even if file is not in merge baseLibravatar Johannes Schindelin1-10/+7
2007-07-07Merge branch 'jc/diff-mark'Libravatar Junio C Hamano1-1/+1
2007-07-06Enable "git rerere" by the config variable rerere.enabledLibravatar Johannes Schindelin1-4/+28
2007-07-06Future-proof source for changes in xdemitconf_tLibravatar Johannes Schindelin1-1/+1
2007-06-26detect close failure on just-written file handlesLibravatar Jim Meyering1-1/+2
2007-06-07War on whitespaceLibravatar Junio C Hamano1-1/+0
2007-04-04rerere: make sorting really stable.Libravatar Junio C Hamano1-2/+5
2007-04-03Merge 1.5.0.7 inLibravatar Junio C Hamano1-0/+9
2007-04-03rerere should not repeat the earlier hunks in later onesLibravatar Junio C Hamano1-0/+9
2007-02-25Merge branch 'maint'Libravatar Junio C Hamano1-6/+10
2007-02-25rerere: do not deal with symlinks.Libravatar Junio C Hamano1-5/+9
2007-02-25rerere: do not skip two conflicted paths next to each other.Libravatar Junio C Hamano1-1/+1
2007-02-20prefixcmp(): fix-up mechanical conversion.Libravatar Junio C Hamano1-3/+3
2007-02-20Mechanical conversion to use prefixcmp()Libravatar Junio C Hamano1-3/+3
2007-01-08short i/o: fix calls to write to use xwrite or write_in_fullLibravatar Andy Whitcroft1-4/+7
2007-01-04rerere: Fix removal of already resolved path.Libravatar Junio C Hamano1-4/+3
2006-12-27rerere gc: honor configuration and document itLibravatar Junio C Hamano1-0/+13
2006-12-21Make git-rerere a builtinLibravatar Johannes Schindelin1-0/+406
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 09:47:58 +0000