| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix spelling errors in code comments | Elijah Newren | 2019-11-10 | 1 | -1/+1 |
* | rerere: replace sha1_to_hex | brian m. carlson | 2019-08-19 | 1 | -4/+4 |
* | read-cache.c: kill read_index() | Nguyễn Thái Ngọc Duy | 2019-01-14 | 1 | -3/+3 |
* | repository.c: replace hold_locked_index() with repo_hold_locked_index() | Nguyễn Thái Ngọc Duy | 2019-01-14 | 1 | -1/+1 |
* | rerere.c: remove the_repository references | Nguyễn Thái Ngọc Duy | 2018-11-12 | 1 | -13/+13 |
* | Merge branch 'bc/hash-transition-part-15' | Junio C Hamano | 2018-10-30 | 1 | -41/+44 |
|\ |
|
| * | rerere: convert to use the_hash_algo | brian m. carlson | 2018-10-15 | 1 | -39/+42 |
* | | Merge branch 'nd/the-index' | Junio C Hamano | 2018-10-19 | 1 | -55/+66 |
|\ \
| |/
|/| |
|
| * | rerere.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -55/+64 |
| * | ll-merge.c: remove implicit dependency on the_index | Nguyễn Thái Ngọc Duy | 2018-09-21 | 1 | -4/+6 |
* | | Merge branch 'en/rerere-multi-stage-1-fix' | Junio C Hamano | 2018-09-24 | 1 | -1/+1 |
|\ \ |
|
| * | | rerere: avoid buffer overrun | Elijah Newren | 2018-09-11 | 1 | -1/+1 |
* | | | Merge branch 'tg/rerere' | Junio C Hamano | 2018-09-17 | 1 | -127/+116 |
|\ \ \
| |_|/
|/| | |
|
| * | | rerere: recalculate conflict ID when unresolved conflict is committed | Thomas Gummerer | 2018-08-06 | 1 | -4/+3 |
| * | | rerere: teach rerere to handle nested conflicts | Thomas Gummerer | 2018-08-06 | 1 | -2/+8 |
| * | | rerere: return strbuf from handle path | Thomas Gummerer | 2018-08-06 | 1 | -40/+18 |
| * | | rerere: factor out handle_conflict function | Thomas Gummerer | 2018-08-06 | 1 | -40/+47 |
| * | | rerere: only return whether a path has conflicts or not | Thomas Gummerer | 2018-08-06 | 1 | -11/+12 |
| * | | rerere: fix crash with files rerere can't handle | Thomas Gummerer | 2018-08-06 | 1 | -5/+7 |
| * | | rerere: add documentation for conflict normalization | Thomas Gummerer | 2018-08-06 | 1 | -4/+0 |
| * | | rerere: mark strings for translation | Thomas Gummerer | 2018-08-06 | 1 | -34/+34 |
| * | | rerere: wrap paths in output in sq | Thomas Gummerer | 2018-07-16 | 1 | -13/+13 |
| * | | rerere: lowercase error messages | Thomas Gummerer | 2018-07-16 | 1 | -12/+12 |
| * | | rerere: unify error messages when read_cache fails | Thomas Gummerer | 2018-07-16 | 1 | -3/+3 |
* | | | dir.c: remove an implicit dependency on the_index in pathspec code | Nguyễn Thái Ngọc Duy | 2018-08-13 | 1 | -1/+1 |
* | | | Merge branch 'sb/object-store-grafts' | Junio C Hamano | 2018-07-18 | 1 | -3/+5 |
|\ \ \
| |/ /
|/| | |
|
| * | | path.c: migrate global git_path_* to take a repository argument | Stefan Beller | 2018-05-18 | 1 | -3/+4 |
| * | | object-store: move object access functions to object-store.h | Stefan Beller | 2018-05-16 | 1 | -0/+1 |
* | | | Merge branch 'ma/lockfile-cleanup' | Junio C Hamano | 2018-05-30 | 1 | -2/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | lock_file: move static locks into functions | Martin Ågren | 2018-05-10 | 1 | -2/+1 |
| |/ |
|
* | | Merge branch 'bc/object-id' | Junio C Hamano | 2018-04-10 | 1 | -2/+2 |
|\ \
| |/
|/| |
|
| * | sha1_file: convert read_sha1_file to struct object_id | brian m. carlson | 2018-03-14 | 1 | -2/+2 |
* | | write_locked_index(): add flag to avoid writing unchanged indexma/skip-writing-unchanged-index | Martin Ågren | 2018-03-01 | 1 | -5/+3 |
|/ |
|
* | Use MOVE_ARRAYsg/cocci-move-array | SZEDER Gábor | 2018-01-22 | 1 | -2/+2 |
* | Merge branch 'jk/write-in-full-fix' | Junio C Hamano | 2017-09-25 | 1 | -1/+1 |
|\ |
|
| * | avoid "write_in_full(fd, buf, len) != len" pattern | Jeff King | 2017-09-14 | 1 | -1/+1 |
* | | 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 |