summaryrefslogtreecommitdiff
path: root/builtin-rerere.c
AgeCommit message (Expand)Author
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds
2010-01-21Make 'rerere forget' work from a subdirectory.Johannes Sixt
2010-01-20Merge branch 'jc/cache-unmerge'Junio C Hamano
2010-01-19Merge branch 'jc/rerere'Junio C Hamano
2010-01-11rerere forget path: forget recorded resolutionJunio C Hamano
2009-12-05Sync with 1.6.5.5Junio C Hamano
2009-12-04rerere: don't segfault on failure to open rr-cacheJeff King
2009-12-04Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano
2009-11-10Let 'git <command> -h' show usage without a git dirJonathan Nieder
2009-04-30replace direct calls to unlink(2) with unlink_or_warnAlex Riesen
2009-02-15rerere: remove duplicated functionsSZEDER Gábor
2009-01-11add is_dot_or_dotdot inline functionAlexander Potashev
2008-10-25Always initialize xpparam_t to 0Brian Downing
2008-07-22Rename path_list to string_listJohannes Schindelin
2008-07-17Merge branch 'sb/dashless'Junio C Hamano
2008-07-13Make usage strings dash-lessStephan Beyer
2008-07-10rerere: Separate libgit and builtin functionsStephan Beyer
2008-07-10builtin-rerere: more carefully find conflict markersOlivier Marin
2008-06-22rerere.autoupdateJunio C Hamano
2008-06-22rerere: remove dubious "tail_optimization"Junio C Hamano
2008-06-22git-rerere: detect unparsable conflictsJunio C Hamano
2008-06-22rerere: rerere_created_at() and has_resolution() abstractionJunio C Hamano
2008-06-17builtin-rerere: fix a small leakJunio C Hamano
2008-05-14Provide git_config with a callback-data parameterJohannes Schindelin
2008-02-26Merge branch 'maint'Junio C Hamano
2008-02-25Use a single implementation and API for copy_file()Daniel Barkalow
2008-01-21Make on-disk index representation separate from in-core oneLinus Torvalds
2008-01-16Improve use of lockfile APIBrandon Casey
2007-12-14xdl_diff: identify call sites.Junio C Hamano
2007-09-27Export rerere() and launch_editor().Kristian Høgsberg
2007-09-27rerere: Fix use of an empty strbuf.bufJunio C Hamano
2007-09-26Make builtin-rerere use of strbuf nicer and more efficient.Pierre Habouzit
2007-09-17Now that cache.h needs strbuf.h, remove useless includes.Pierre Habouzit
2007-09-10Strbuf API extensions and fixes.Pierre Habouzit
2007-09-07Use strbuf API in buitin-rerere.cPierre Habouzit
2007-07-15Make every builtin-*.c file #include "builtin.h"Peter Hagervall
2007-07-10rerere: record resolution even if file is not in merge baseJohannes Schindelin
2007-07-07Merge branch 'jc/diff-mark'Junio C Hamano
2007-07-07Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin
2007-07-06Future-proof source for changes in xdemitconf_tJohannes Schindelin
2007-06-27detect close failure on just-written file handlesJim Meyering
2007-06-07War on whitespaceJunio C Hamano
2007-04-04rerere: make sorting really stable.Junio C Hamano
2007-04-04Merge 1.5.0.7 inJunio C Hamano
2007-04-04rerere should not repeat the earlier hunks in later onesJunio C Hamano
2007-02-25Merge branch 'maint'Junio C Hamano
2007-02-25rerere: do not deal with symlinks.Junio C Hamano
2007-02-25rerere: do not skip two conflicted paths next to each other.Junio C Hamano
2007-02-21prefixcmp(): fix-up mechanical conversion.Junio C Hamano
2007-02-21Mechanical conversion to use prefixcmp()Junio C Hamano