Age | Commit message (Expand) | Author | Files | Lines |
2015-06-28 | rerere: fix an off-by-one non-bug | Junio C Hamano | 1 | -4/+2 |
2015-05-26 | Merge branch 'jk/rerere-forget-check-enabled' | Junio C Hamano | 1 | -0/+2 |
2015-05-14 | rerere: exit silently on "forget" when rerere is disabled | Jeff King | 1 | -0/+2 |
2015-02-24 | Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint | Junio C Hamano | 1 | -10/+6 |
2015-02-11 | Merge branch 'jn/rerere-fail-on-auto-update-failure' | Junio C Hamano | 1 | -10/+6 |
2015-01-08 | rerere: error out on autoupdate failure | Jonathan Nieder | 1 | -10/+6 |
2014-10-01 | lockfile.h: extract new header file for the functions in lockfile.c | Michael Haggerty | 1 | -0/+1 |
2014-08-07 | rerere.c: replace `git_config()` with `git_config_get_*()` family | Tanay Abhra | 1 | -31/+12 |
2014-07-16 | Merge branch 'rs/code-cleaning' | Junio C Hamano | 1 | -2/+2 |
2014-07-10 | use strbuf_addbuf for adding strbufs | René Scharfe | 1 | -2/+2 |
2014-06-13 | read-cache: new API write_locked_index instead of write_index/write_cache | Nguyễn Thái Ngọc Duy | 1 | -2/+1 |
2014-02-24 | pathspec: pass directory indicator to match_pathspec_item() | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2014-02-24 | pathspec: rename match_pathspec_depth() to match_pathspec() | Nguyễn Thái Ngọc Duy | 1 | -2/+2 |
2013-09-09 | Merge branch 'jl/submodule-mv' | Junio C Hamano | 1 | -3/+4 |
2013-07-15 | convert unmerge_cache to take struct pathspec | Nguyễn Thái Ngọc Duy | 1 | -1/+1 |
2013-07-15 | rerere: convert to use parse_pathspec | Nguyễn Thái Ngọc Duy | 1 | -4/+5 |
2013-07-09 | Convert "struct cache_entry *" to "const ..." wherever possible | Nguyễn Thái Ngọc Duy | 1 | -6/+6 |
2013-04-04 | rerere forget: do not segfault if not all stages are present | Johannes Sixt | 1 | -8/+7 |
2013-04-02 | rerere forget: grok files containing NUL | Johannes Sixt | 1 | -2/+4 |
2012-09-15 | rerere.c: mark private file-scope symbols as static | Junio C Hamano | 1 | -1/+1 |
2012-07-15 | Merge branch 'ar/clone-honor-umask-at-top' | Junio C Hamano | 1 | -1/+1 |
2012-07-09 | rerere: make rr-cache fanout directory honor umask | Junio C Hamano | 1 | -1/+1 |
2012-06-07 | rerere: remove i18n legos in result message | Nguyễn Thái Ngọc Duy | 1 | -6/+6 |
2011-05-30 | Merge branch 'maint' | Junio C Hamano | 1 | -2/+8 |
2011-05-30 | Merge branch 'jm/maint-misc-fix' into maint | Junio C Hamano | 1 | -2/+8 |
2011-05-26 | plug a DIR buffer leak in rerere.c | Jim Meyering | 1 | -0/+1 |
2011-05-26 | rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0' | Jim Meyering | 1 | -2/+8 |
2011-05-08 | rerere: libify rerere_clear() and rerere_gc() | Junio C Hamano | 1 | -0/+84 |
2011-04-03 | sparse: Fix errors and silence warnings | Stephen Boyd | 1 | -1/+1 |
2011-03-26 | Merge branch 'jc/maint-rerere-in-workdir' | Junio C Hamano | 1 | -2/+1 |
2011-03-23 | rerere: make sure it works even in a workdir attached to a young repository | Junio C Hamano | 1 | -2/+1 |
2011-02-16 | rerere "remaining" | Martin von Zweigbergk | 1 | -10/+68 |
2010-10-26 | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 1 | -1/+1 |
2010-09-03 | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 1 | -0/+4 |
2010-08-31 | Merge branch 'sg/rerere-gc-old-still-used' | Junio C Hamano | 1 | -1/+7 |
2010-08-26 | ll-merge: replace flag argument with options struct | Jonathan Nieder | 1 | -1/+1 |
2010-08-06 | rerere: never renormalize | Jonathan Nieder | 1 | -6/+5 |
2010-08-06 | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 1 | -5/+10 |
2010-07-14 | rerere: fix overeager gc | SZEDER Gábor | 1 | -1/+7 |
2010-07-05 | string_list: Add STRING_LIST_INIT macro and make use of it. | Thiago Farina | 1 | -5/+5 |
2010-06-30 | Merge branch 'jp/string-list-api-cleanup' | Junio C Hamano | 1 | -5/+5 |
2010-06-27 | string_list: Fix argument order for string_list_insert | Julian Phillips | 1 | -5/+5 |
2010-05-31 | enums: omit trailing comma for portability | Gary V. Vaughan | 1 | -1/+1 |
2010-03-20 | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 1 | -2/+2 |
2010-02-23 | rerere: fix memory leak if rerere images can't be read | Bert Wesarg | 1 | -3/+6 |
2010-01-28 | rerere: fix too-short initialization | Jeff King | 1 | -1/+1 |
2010-01-20 | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 1 | -14/+46 |
2010-01-20 | Merge branch 'jc/cache-unmerge' | Junio C Hamano | 1 | -42/+217 |
2010-01-17 | rerere: honor conflict-marker-size attribute | Junio C Hamano | 1 | -2/+3 |
2010-01-17 | rerere: prepare for customizable conflict marker length | Junio C Hamano | 1 | -10/+44 |