summaryrefslogtreecommitdiff
path: root/builtin-rerere.c
Commit message (Expand)AuthorAgeFilesLines
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-221-155/+0
* Make 'rerere forget' work from a subdirectory.Johannes Sixt2010-01-211-2/+4
* Merge branch 'jc/cache-unmerge'Junio C Hamano2010-01-201-0/+3
|\
| * rerere forget path: forget recorded resolutionJunio C Hamano2010-01-101-0/+2
* | Merge branch 'jc/rerere'Junio C Hamano2010-01-181-7/+16
|\ \ | |/ |/|
| * Teach --[no-]rerere-autoupdate option to merge, revert and friendsJunio C Hamano2009-12-041-7/+16
* | Sync with 1.6.5.5Junio C Hamano2009-12-051-0/+2
|\ \ | |/ |/|
| * rerere: don't segfault on failure to open rr-cacheJeff King2009-12-041-0/+2
* | Let 'git <command> -h' show usage without a git dirJonathan Nieder2009-11-101-0/+3
|/
* replace direct calls to unlink(2) with unlink_or_warnAlex Riesen2009-04-291-1/+1
* rerere: remove duplicated functionsSZEDER Gábor2009-02-141-18/+7
* add is_dot_or_dotdot inline functionAlexander Potashev2009-01-111-6/+5
* Always initialize xpparam_t to 0Brian Downing2008-10-251-0/+1
* Rename path_list to string_listJohannes Schindelin2008-07-211-10/+10
* Merge branch 'sb/dashless'Junio C Hamano2008-07-161-1/+1
|\
| * Make usage strings dash-lessStephan Beyer2008-07-131-1/+1
* | rerere: Separate libgit and builtin functionsStephan Beyer2008-07-101-354/+18
* | builtin-rerere: more carefully find conflict markersOlivier Marin2008-07-101-3/+13
|/
* rerere.autoupdateJunio C Hamano2008-06-221-0/+37
* rerere: remove dubious "tail_optimization"Junio C Hamano2008-06-221-10/+9
* git-rerere: detect unparsable conflictsJunio C Hamano2008-06-221-0/+5
* rerere: rerere_created_at() and has_resolution() abstractionJunio C Hamano2008-06-221-31/+26
* builtin-rerere: fix a small leakJunio C Hamano2008-06-171-1/+1
* Provide git_config with a callback-data parameterJohannes Schindelin2008-05-141-3/+3
* Merge branch 'maint'Junio C Hamano2008-02-261-18/+1
|\
| * Use a single implementation and API for copy_file()Daniel Barkalow2008-02-251-18/+1
* | Make on-disk index representation separate from in-core oneLinus Torvalds2008-01-211-2/+2
|/
* Improve use of lockfile APIBrandon Casey2008-01-161-2/+2
* xdl_diff: identify call sites.Junio C Hamano2007-12-131-1/+1
* Export rerere() and launch_editor().Kristian Høgsberg2007-09-271-5/+26
* rerere: Fix use of an empty strbuf.bufJunio C Hamano2007-09-261-2/+4
* Make builtin-rerere use of strbuf nicer and more efficient.Pierre Habouzit2007-09-261-25/+18
* Now that cache.h needs strbuf.h, remove useless includes.Pierre Habouzit2007-09-161-1/+0
* Strbuf API extensions and fixes.Pierre Habouzit2007-09-101-2/+2
* Use strbuf API in buitin-rerere.cPierre Habouzit2007-09-061-38/+18
* Make every builtin-*.c file #include "builtin.h"Peter Hagervall2007-07-141-0/+1
* rerere: record resolution even if file is not in merge baseJohannes Schindelin2007-07-091-10/+7
* Merge branch 'jc/diff-mark'Junio C Hamano2007-07-071-1/+1
|\
| * Future-proof source for changes in xdemitconf_tJohannes Schindelin2007-07-061-1/+1
* | Enable "git rerere" by the config variable rerere.enabledJohannes Schindelin2007-07-061-4/+28
|/
* detect close failure on just-written file handlesJim Meyering2007-06-261-1/+2
* War on whitespaceJunio C Hamano2007-06-071-1/+0
* rerere: make sorting really stable.Junio C Hamano2007-04-041-2/+5
* Merge 1.5.0.7 inJunio C Hamano2007-04-031-0/+9
|\
| * rerere should not repeat the earlier hunks in later onesJunio C Hamano2007-04-031-0/+9
* | Merge branch 'maint'Junio C Hamano2007-02-251-6/+10
|\ \ | |/
| * rerere: do not deal with symlinks.Junio C Hamano2007-02-251-5/+9
| * rerere: do not skip two conflicted paths next to each other.Junio C Hamano2007-02-251-1/+1
* | prefixcmp(): fix-up mechanical conversion.Junio C Hamano2007-02-201-3/+3
* | Mechanical conversion to use prefixcmp()Junio C Hamano2007-02-201-3/+3
|/
View Lorry Controller Status