summaryrefslogtreecommitdiff
path: root/builtin/rerere.c
AgeCommit message (Expand)Author
2012-08-20i18n: rerere: mark parseopt strings for translationNguyễn Thái Ngọc Duy
2011-05-08rerere: libify rerere_clear() and rerere_gc()Junio C Hamano
2011-03-02rerere forget: deprecate invocation without pathspecJohannes Sixt
2011-02-16rerere "remaining"Martin von Zweigbergk
2010-09-03Merge branch 'jn/merge-renormalize'Junio C Hamano
2010-08-31Merge branch 'sg/rerere-gc-old-still-used'Junio C Hamano
2010-08-18Merge branch 'tf/string-list-init'Junio C Hamano
2010-08-06rerere: migrate to parse-options APIJonathan Nieder
2010-07-15Merge branch 'js/merge-rr-fix'Junio C Hamano
2010-07-14MERGE_RR is in .git, not .git/rr-cacheJay Soffian
2010-07-14rerere: fix overeager gcSZEDER Gábor
2010-07-05string_list: Add STRING_LIST_INIT macro and make use of it.Thiago Farina
2010-06-30Merge branch 'jp/string-list-api-cleanup'Junio C Hamano
2010-06-27string_list: Fix argument order for string_list_appendJulian Phillips
2010-06-21Merge branch 'rs/diff-no-minimal' into maintJunio C Hamano
2010-06-13Merge branch 'rs/diff-no-minimal'Junio C Hamano
2010-02-22Move 'builtin-*' into a 'builtin/' subdirectoryLinus Torvalds