aboutsummaryrefslogtreecommitdiff
path: root/builtin-rerere.c
Commit message (Expand)AuthorAge
* Merge branch 'jc/rerere'Junio C Hamano2010-01-18
|\
| * Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-04
* | Sync with 1.6.5.5Junio C Hamano2009-12-05
|\ \ | |/ |/|
| * rerere: don't segfault on failure to open rr-cacheJeff King2009-12-04
* | Let 'git <command> -h' show usage without a git dirJonathan Nieder2009-11-10
|/
* replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-29
* rerere: remove duplicated functionsSZEDER Gábor2009-02-14
* add is_dot_or_dotdot inline functionAlexander Potashev2009-01-11
* Always initialize xpparam_t to 0Brian Downing2008-10-25
* Rename path_list to string_listJohannes Schindelin2008-07-21
* Merge branch 'sb/dashless'Junio C Hamano2008-07-16
|\
| * Make usage strings dash-lessStephan Beyer2008-07-13
* | rerere: Separate libgit and builtin functionsStephan Beyer2008-07-10
* | builtin-rerere: more carefully find conflict markersOlivier Marin2008-07-10
|/
* rerere.autoupdateJunio C Hamano2008-06-22
* rerere: remove dubious "tail_optimization"Junio C Hamano2008-06-22
* git-rerere: detect unparsable conflictsJunio C Hamano2008-06-22
* rerere: rerere_created_at() and has_resolution() abstractionJunio C Hamano2008-06-22
* builtin-rerere: fix a small leakJunio C Hamano2008-06-17
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-14
* Merge branch 'maint'Junio C Hamano2008-02-26
|\
| * Use a single implementation and API for copy_file()Daniel Barkalow2008-02-25
* | Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-21
|/
* Improve use of lockfile APIBrandon Casey2008-01-16
* xdl_diff: identify call sites.Junio C Hamano2007-12-13
* Export rerere() and launch_editor().Kristian Høgsberg2007-09-27
* rerere: Fix use of an empty strbuf.bufJunio C Hamano2007-09-26
* Make builtin-rerere use of strbuf nicer and more efficient.Pierre Habouzit2007-09-26
* Now that cache.h needs strbuf.h, remove useless includes.Pierre Habouzit2007-09-16
* Strbuf API extensions and fixes.Pierre Habouzit2007-09-10
* Use strbuf API in buitin-rerere.cPierre Habouzit2007-09-06
* Make every builtin-*.c file #include "builtin.h"Peter Hagervall2007-07-14
* rerere: record resolution even if file is not in merge baseJohannes Schindelin2007-07-09
* Merge branch 'jc/diff-mark'Junio C Hamano2007-07-07
|\
| * Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-06
* | Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-06
|/
* detect close failure on just-written file handlesJim Meyering2007-06-26
* War on whitespaceJunio C Hamano2007-06-07
* rerere: make sorting really stable.Junio C Hamano2007-04-04
* Merge 1.5.0.7 inJunio C Hamano2007-04-03
|\
| * rerere should not repeat the earlier hunks in later onesJunio C Hamano2007-04-03
* | Merge branch 'maint'Junio C Hamano2007-02-25
|\ \ | |/
| * rerere: do not deal with symlinks.Junio C Hamano2007-02-25
| * rerere: do not skip two conflicted paths next to each other.Junio C Hamano2007-02-25
* | prefixcmp(): fix-up mechanical conversion.Junio C Hamano2007-02-20
* | Mechanical conversion to use prefixcmp()Junio C Hamano2007-02-20
|/
* short i/o: fix calls to write to use xwrite or write_in_fullAndy Whitcroft2007-01-08
* rerere: Fix removal of already resolved path.Junio C Hamano2007-01-04
* rerere gc: honor configuration and document itJunio C Hamano2006-12-27
* Make git-rerere a builtinJohannes Schindelin2006-12-21
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-13 08:36:23 +0000