| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'maint' | Junio C Hamano | 2011-05-30 | 1 | -2/+8 |
|\ |
|
| * | Merge branch 'jm/maint-misc-fix' into maint | Junio C Hamano | 2011-05-30 | 1 | -2/+8 |
| |\ |
|
| | * | rerere.c: diagnose a corrupt MERGE_RR when hitting EOF between TAB and '\0' | Jim Meyering | 2011-05-26 | 1 | -2/+8 |
* | | | plug a DIR buffer leak in rerere.c | Jim Meyering | 2011-05-26 | 1 | -0/+1 |
* | | | rerere: libify rerere_clear() and rerere_gc() | Junio C Hamano | 2011-05-08 | 1 | -0/+84 |
|/ / |
|
* | | sparse: Fix errors and silence warnings | Stephen Boyd | 2011-04-03 | 1 | -1/+1 |
* | | Merge branch 'jc/maint-rerere-in-workdir' | Junio C Hamano | 2011-03-26 | 1 | -2/+1 |
|\ \ |
|
| * | | rerere: make sure it works even in a workdir attached to a young repository | Junio C Hamano | 2011-03-23 | 1 | -2/+1 |
* | | | rerere "remaining" | Martin von Zweigbergk | 2011-02-16 | 1 | -10/+68 |
| |/
|/| |
|
* | | Merge branch 'jf/merge-ignore-ws' | Junio C Hamano | 2010-10-26 | 1 | -1/+1 |
|\ \ |
|
| * | | ll-merge: replace flag argument with options struct | Jonathan Nieder | 2010-08-26 | 1 | -1/+1 |
* | | | Merge branch 'jn/merge-renormalize' | Junio C Hamano | 2010-09-03 | 1 | -0/+4 |
|\ \ \
| |/ / |
|
| * | | rerere: never renormalize | Jonathan Nieder | 2010-08-06 | 1 | -6/+5 |
| * | | ll-merge: let caller decide whether to renormalize | Jonathan Nieder | 2010-08-06 | 1 | -5/+10 |
* | | | Merge branch 'sg/rerere-gc-old-still-used' | Junio C Hamano | 2010-08-31 | 1 | -1/+7 |
|\ \ \ |
|
| * | | | rerere: fix overeager gc | SZEDER Gábor | 2010-07-14 | 1 | -1/+7 |
* | | | | string_list: Add STRING_LIST_INIT macro and make use of it. | Thiago Farina | 2010-07-05 | 1 | -5/+5 |
* | | | | Merge branch 'jp/string-list-api-cleanup' | Junio C Hamano | 2010-06-30 | 1 | -5/+5 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | string_list: Fix argument order for string_list_insert | Julian Phillips | 2010-06-27 | 1 | -5/+5 |
| |/ / |
|
* | | | enums: omit trailing comma for portability | Gary V. Vaughan | 2010-05-31 | 1 | -1/+1 |
|/ / |
|
* | | ll_merge(): add ancestor label parameter for diff3-style output | Jonathan Nieder | 2010-03-20 | 1 | -2/+2 |
|/ |
|
* | rerere: fix memory leak if rerere images can't be read | Bert Wesarg | 2010-02-23 | 1 | -3/+6 |
* | rerere: fix too-short initialization | Jeff King | 2010-01-28 | 1 | -1/+1 |
* | Merge branch 'jc/conflict-marker-size' | Junio C Hamano | 2010-01-20 | 1 | -14/+46 |
|\ |
|
| * | rerere: honor conflict-marker-size attribute | Junio C Hamano | 2010-01-17 | 1 | -2/+3 |
| * | rerere: prepare for customizable conflict marker length | Junio C Hamano | 2010-01-17 | 1 | -10/+44 |
| * | rerere: use ll_merge() instead of using xdl_merge() | Junio C Hamano | 2010-01-16 | 1 | -4/+1 |
| * | xdl_merge(): introduce xmparam_t for merge specific parameters | Junio C Hamano | 2010-01-16 | 1 | -2/+2 |
* | | Merge branch 'jc/cache-unmerge' | Junio C Hamano | 2010-01-20 | 1 | -42/+217 |
|\ \
| |/ |
|
| * | rerere forget path: forget recorded resolution | Junio C Hamano | 2010-01-10 | 1 | -0/+133 |
| * | rerere: refactor rerere logic to make it independent from I/O | Junio C Hamano | 2010-01-10 | 1 | -35/+76 |
| * | rerere: remove silly 1024-byte line limit | Junio C Hamano | 2009-12-25 | 1 | -9/+10 |
* | | Teach --[no-]rerere-autoupdate option to merge, revert and friends | Junio C Hamano | 2009-12-04 | 1 | -3/+5 |
|/ |
|
* | use write_str_in_full helper to avoid literal string lengths | Jim Meyering | 2009-09-13 | 1 | -1/+1 |
* | replace direct calls to unlink(2) with unlink_or_warn | Alex Riesen | 2009-04-29 | 1 | -1/+1 |
* | rerere: remove duplicated functions | SZEDER Gábor | 2009-02-14 | 1 | -11/+11 |
* | Drop double-semicolon in C | Junio C Hamano | 2009-02-10 | 1 | -1/+1 |
* | Make some of fwrite/fclose/write/close failures visible | Alex Riesen | 2008-12-04 | 1 | -11/+35 |
* | Merge branch 'ar/maint-mksnpath' into ar/mksnpath | Junio C Hamano | 2008-10-30 | 1 | -1/+1 |
|\ |
|
| * | Use git_pathdup instead of xstrdup(git_path(...)) | Alex Riesen | 2008-10-30 | 1 | -1/+1 |
* | | Merge branch 'jc/maint-co-track' | Junio C Hamano | 2008-10-21 | 1 | -1/+2 |
|\ \ |
|
| * | | Enhance hold_lock_file_for_{update,append}() API | Junio C Hamano | 2008-10-19 | 1 | -1/+2 |
| |/ |
|
* | | Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer | Brandon Casey | 2008-10-12 | 1 | -3/+1 |
* | | fix openssl headers conflicting with custom SHA1 implementations | Nicolas Pitre | 2008-10-02 | 1 | -5/+5 |
* | | Merge branch 'jc/better-conflict-resolution' | Shawn O. Pearce | 2008-09-29 | 1 | -10/+19 |
|\ \ |
|
| * | | rerere: understand "diff3 -m" style conflicts with the original | Junio C Hamano | 2008-08-30 | 1 | -2/+8 |
| * | | rerere.c: use symbolic constants to keep track of parsing states | Junio C Hamano | 2008-08-30 | 1 | -10/+13 |
| |/ |
|
* | | is_directory(): a generic helper function | Junio C Hamano | 2008-09-09 | 1 | -2/+1 |
|/ |
|
* | Rename path_list to string_list | Johannes Schindelin | 2008-07-21 | 1 | -20/+20 |
* | rerere.autoupdate: change the message when autoupdate is in effect | Junio C Hamano | 2008-07-16 | 1 | -2/+5 |