| Commit message (Expand) | Author | Age | Files | Lines |
* | rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolvedjc/cutoff-config | Junio C Hamano | 2017-08-22 | 1 | -12/+2 |
* | rerere: represent time duration in timestamp_t internally | Junio C Hamano | 2017-08-22 | 1 | -13/+23 |
* | Merge branch 'ab/free-and-null' | Junio C Hamano | 2017-06-24 | 1 | -2/+1 |
|\ |
|
| * | *.[ch] refactoring: make use of the FREE_AND_NULL() macro | Ævar Arnfjörð Bjarmason | 2017-06-16 | 1 | -2/+1 |
* | | Merge branch 'bw/config-h' | Junio C Hamano | 2017-06-24 | 1 | -0/+1 |
|\ \
| |/
|/| |
|
| * | config: don't include config.h by default | Brandon Williams | 2017-06-15 | 1 | -0/+1 |
* | | rerere.c: move error_errno() closer to the source system call | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -1/+2 |
* | | print errno when reporting a system call error | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -2/+2 |
* | | wrapper.c: add and use fopen_or_warn() | Nguyễn Thái Ngọc Duy | 2017-05-26 | 1 | -1/+1 |
|/ |
|
* | hold_locked_index(): align error handling with hold_lockfile_for_update() | Junio C Hamano | 2016-12-07 | 1 | -1/+1 |
* | cache: convert struct cache_entry to use struct object_id | brian m. carlson | 2016-09-07 | 1 | -1/+2 |
* | Merge branch 'jc/rerere-multi' | Junio C Hamano | 2016-05-23 | 1 | -8/+17 |
|\ |
|
| * | rerere: remove an null statementjc/rerere-multi | Junio C Hamano | 2016-05-19 | 1 | -1/+1 |
| * | rerere: plug memory leaks upon "rerere forget" failure | Junio C Hamano | 2016-05-11 | 1 | -8/+17 |
* | | Merge branch 'nd/error-errno' | Junio C Hamano | 2016-05-17 | 1 | -11/+7 |
|\ \ |
|
| * | | rerere.c: use error_errno() and warning_errno() | Nguyễn Thái Ngọc Duy | 2016-05-09 | 1 | -11/+7 |
* | | | Merge branch 'jc/rerere-multi' | Junio C Hamano | 2016-04-25 | 1 | -194/+432 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | rerere: adjust 'forget' to multi-variant world order | Junio C Hamano | 2016-04-06 | 1 | -1/+27 |
| * | rerere: split code to call ll_merge() further | Junio C Hamano | 2016-04-06 | 1 | -16/+31 |
| * | rerere: move code related to "forget" together | Junio C Hamano | 2016-04-06 | 1 | -97/+97 |
| * | rerere: gc and clear | Junio C Hamano | 2016-04-06 | 1 | -39/+48 |
| * | rerere: do use multiple variants | Junio C Hamano | 2016-03-15 | 1 | -38/+60 |
| * | rerere: allow multiple variants to exist | Junio C Hamano | 2016-03-15 | 1 | -22/+105 |
| * | rerere: delay the recording of preimage | Junio C Hamano | 2016-03-15 | 1 | -27/+25 |
| * | rerere: handle leftover rr-cache/$ID directory and postimage files | Junio C Hamano | 2016-03-15 | 1 | -17/+25 |
| * | rerere: scan $GIT_DIR/rr-cache/$ID when instantiating a rerere_id | Junio C Hamano | 2016-02-08 | 1 | -3/+29 |
| * | rerere: split conflict ID further | Junio C Hamano | 2016-02-08 | 1 | -5/+56 |
* | | Merge branch 'jk/rerere-xsnprintf' | Junio C Hamano | 2016-02-17 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | rerere: replace strcpy with xsnprintfjk/rerere-xsnprintf | Jeff King | 2016-02-08 | 1 | -2/+2 |
* | | Merge branch 'jc/rerere' | Junio C Hamano | 2015-10-05 | 1 | -151/+404 |
|\ \
| |/ |
|
| * | rerere: un-nest merge() furtherjc/rerere | Junio C Hamano | 2015-07-24 | 1 | -24/+26 |
| * | rerere: use "struct rerere_id" instead of "char *" for conflict ID | Junio C Hamano | 2015-07-24 | 1 | -26/+73 |
| * | rerere: call conflict-ids IDs | Junio C Hamano | 2015-07-24 | 1 | -38/+38 |
| * | rerere: further clarify do_rerere_one_path() | Junio C Hamano | 2015-07-24 | 1 | -9/+6 |
| * | rerere: further de-dent do_plain_rerere() | Junio C Hamano | 2015-07-24 | 1 | -32/+33 |
| * | rerere: refactor "replay" part of do_plain_rerere() | Junio C Hamano | 2015-07-24 | 1 | -35/+40 |
| * | rerere: explain the remainder | Junio C Hamano | 2015-07-24 | 1 | -0/+20 |
| * | rerere: explain "rerere forget" codepath | Junio C Hamano | 2015-07-24 | 1 | -0/+24 |
| * | rerere: explain the primary codepath | Junio C Hamano | 2015-07-24 | 1 | -13/+82 |
| * | rerere: explain MERGE_RR management helpers | Junio C Hamano | 2015-07-24 | 1 | -0/+41 |
| * | rerere: fix benign off-by-one non-bug and clarify code | Junio C Hamano | 2015-07-24 | 1 | -1/+8 |
| * | rerere: explain the rerere I/O abstraction | Junio C Hamano | 2015-07-24 | 1 | -7/+31 |
| * | rerere: do not leak mmfile[] for a path with multiple stage #1 entries | Junio C Hamano | 2015-07-24 | 1 | -2/+4 |
| * | rerere: stop looping unnecessarily | Junio C Hamano | 2015-07-24 | 1 | -10/+7 |
| * | rerere: drop want_sp parameter from is_cmarker() | Junio C Hamano | 2015-07-24 | 1 | -5/+22 |
| * | rerere: report autoupdated paths only after actually updating them | Junio C Hamano | 2015-07-24 | 1 | -10/+12 |
| * | rerere: write out each record of MERGE_RR in one go | Junio C Hamano | 2015-07-24 | 1 | -7/+9 |
| * | rerere: lift PATH_MAX limitation | Junio C Hamano | 2015-07-24 | 1 | -20/+15 |
| * | rerere: plug conflict ID leaks | Junio C Hamano | 2015-07-24 | 1 | -2/+5 |
| * | rerere: handle conflicts with multiple stage #1 entries | Junio C Hamano | 2015-07-24 | 1 | -1/+1 |