aboutsummaryrefslogtreecommitdiff
path: root/builtin/rerere.c
Commit message (Expand)AuthorAge
* rerere: fix for merge.conflictstyleFelipe Contreras2014-04-30
* rerere: convert to use parse_pathspecNguyễn Thái Ngọc Duy2013-07-15
* i18n: rerere: mark parseopt strings for translationNguyễn Thái Ngọc Duy2012-08-20
* rerere: libify rerere_clear() and rerere_gc()Junio C Hamano2011-05-08
* rerere forget: deprecate invocation without pathspecJohannes Sixt2011-03-02
* rerere "remaining"Martin von Zweigbergk2011-02-16
* Merge branch 'jn/merge-renormalize'Junio C Hamano2010-09-03
|\
| * rerere: migrate to parse-options APIJonathan Nieder2010-08-06
* | Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano2010-08-31
|\ \
| * | rerere: fix overeager gcSZEDER Gábor2010-07-14
* | | Merge branch 'tf/string-list-init'Junio C Hamano2010-08-18
|\ \ \
| * | | string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina2010-07-05
* | | | Merge branch 'js/merge-rr-fix'Junio C Hamano2010-07-15
|\ \ \ \ | |/ / / |/| | |
| * | | MERGE_RR is in .git, not .git/rr-cacheJay Soffian2010-07-14
| |/ /
| * | Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano2010-06-21
* | | Merge branch 'jp/string-list-api-cleanup'Junio C Hamano2010-06-30
|\ \ \ | |_|/ |/| |
| * | string_list: Fix argument order for string_list_appendJulian Phillips2010-06-27
| |/
* | Merge branch 'rs/diff-no-minimal'Junio C Hamano2010-06-13
|/
* Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds2010-02-22