| Commit message (Expand) | Author | Age |
* | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 |
* | Merge branch 'jc/rerere-multi' | Junio C Hamano | 2016-05-23 |
|\ |
|
| * | rerere: remove an null statement | Junio C Hamano | 2016-05-19 |
| * | rerere: plug memory leaks upon "rerere forget" failure | Junio C Hamano | 2016-05-11 |
* | | Merge branch 'nd/error-errno' | Junio C Hamano | 2016-05-17 |
|\ \ |
|
| * | | rerere.c: use error_errno() and warning_errno() | Nguyễn Thái Ngọc Duy | 2016-05-09 |
* | | | Merge branch 'jc/rerere-multi' | Junio C Hamano | 2016-04-25 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | rerere: adjust 'forget' to multi-variant world order | Junio C Hamano | 2016-04-06 |
| * | rerere: split code to call ll_merge() further | Junio C Hamano | 2016-04-06 |
| * | rerere: move code related to "forget" together | Junio C Hamano | 2016-04-06 |
| * | rerere: gc and clear | Junio C Hamano | 2016-04-06 |
| * | rerere: do use multiple variants | Junio C Hamano | 2016-03-15 |
| * | rerere: allow multiple variants to exist | Junio C Hamano | 2016-03-15 |
| * | rerere: delay the recording of preimage | Junio C Hamano | 2016-03-15 |
| * | rerere: handle leftover rr-cache/$ID directory and postimage files | Junio C Hamano | 2016-03-15 |
| * | rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id | Junio C Hamano | 2016-02-08 |
| * | rerere: split conflict ID further | Junio C Hamano | 2016-02-08 |
* | | Merge branch 'jk/rerere-xsnprintf' | Junio C Hamano | 2016-02-17 |
|\ \
| |/ |
|
| * | rerere: replace strcpy with xsnprintf | Jeff King | 2016-02-08 |
* | | Merge branch 'jc/rerere' | Junio C Hamano | 2015-10-05 |
|\ \
| |/ |
|
| * | rerere: un-nest merge() further | Junio C Hamano | 2015-07-24 |
| * | rerere: use "struct rerere_id" instead of "char *" for conflict ID | Junio C Hamano | 2015-07-24 |
| * | rerere: call conflict-ids IDs | Junio C Hamano | 2015-07-24 |
| * | rerere: further clarify do_rerere_one_path() | Junio C Hamano | 2015-07-24 |
| * | rerere: further de-dent do_plain_rerere() | Junio C Hamano | 2015-07-24 |
| * | rerere: refactor "replay" part of do_plain_rerere() | Junio C Hamano | 2015-07-24 |
| * | rerere: explain the remainder | Junio C Hamano | 2015-07-24 |
| * | rerere: explain "rerere forget" codepath | Junio C Hamano | 2015-07-24 |
| * | rerere: explain the primary codepath | Junio C Hamano | 2015-07-24 |
| * | rerere: explain MERGE_RR management helpers | Junio C Hamano | 2015-07-24 |
| * | rerere: fix benign off-by-one non-bug and clarify code | Junio C Hamano | 2015-07-24 |
| * | rerere: explain the rerere I/O abstraction | Junio C Hamano | 2015-07-24 |
| * | rerere: do not leak mmfile[] for a path with multiple stage #1 entries | Junio C Hamano | 2015-07-24 |
| * | rerere: stop looping unnecessarily | Junio C Hamano | 2015-07-24 |
| * | rerere: drop want_sp parameter from is_cmarker() | Junio C Hamano | 2015-07-24 |
| * | rerere: report autoupdated paths only after actually updating them | Junio C Hamano | 2015-07-24 |
| * | rerere: write out each record of MERGE_RR in one go | Junio C Hamano | 2015-07-24 |
| * | rerere: lift PATH_MAX limitation | Junio C Hamano | 2015-07-24 |
| * | rerere: plug conflict ID leaks | Junio C Hamano | 2015-07-24 |
| * | rerere: handle conflicts with multiple stage #1 entries | Junio C Hamano | 2015-07-24 |
| * | rerere: fix an off-by-one non-bug | Junio C Hamano | 2015-06-28 |
| * | Merge branch 'jn/rerere-fail-on-auto-update-failure' into maint | Junio C Hamano | 2015-02-24 |
| |\ |
|
* | | | rerere: release lockfile in non-writing functions | Jeff King | 2015-09-01 |
* | | | memoize common git-path "constant" files | Jeff King | 2015-08-10 |
* | | | Merge branch 'jk/rerere-forget-check-enabled' | Junio C Hamano | 2015-05-26 |
|\ \ \ |
|
| * | | | rerere: exit silently on "forget" when rerere is disabled | Jeff King | 2015-05-14 |
* | | | | Merge branch 'jn/rerere-fail-on-auto-update-failure' | Junio C Hamano | 2015-02-11 |
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/| |
|
| * | | rerere: error out on autoupdate failure | Jonathan Nieder | 2015-01-08 |
* | | | lockfile.h: extract new header file for the functions in lockfile.c | Michael Haggerty | 2014-10-01 |
* | | | rerere.c: replace `git_config()` with `git_config_get_*()` family | Tanay Abhra | 2014-08-07 |
|/ / |
|