merge: split write_merge_state in two

Michael J Gruber committed about 9 years ago

merge: clarify call chain

Michael J Gruber committed about 9 years ago

pack-objects: take lock before accessing `remaining`

Martin Ågren committed about 9 years ago

convert: always initialize attr_action in convert_attrs

Martin Ågren committed about 9 years ago

rerere: allow approxidate in gc.rerereResolved/gc.rerereUnresolved

Junio C Hamano committed about 9 years ago

rerere: represent time duration in timestamp_t internally

Junio C Hamano committed about 9 years ago

t4200: parameterize "rerere gc" custom expiry test

Junio C Hamano committed about 9 years ago

t4200: gather "rerere gc" together

Junio C Hamano committed about 9 years ago

t4200: make "rerere gc" test more robust

Junio C Hamano committed about 9 years ago

t4200: give us a clean slate after "rerere gc" tests

Junio C Hamano committed about 9 years ago

gitweb: add 'raw' blob_plain link in history overview

Job Snijders committed about 9 years ago

The second batch post 2.14

Junio C Hamano committed about 9 years ago

Merge branch 'mh/packed-ref-store'

Junio C Hamano committed about 9 years ago

Merge branch 'sb/retire-t1200'

Junio C Hamano committed about 9 years ago

Merge branch 'rs/win32-syslog-leakfix'

Junio C Hamano committed about 9 years ago

Merge branch 'rs/unpack-entry-leakfix'

Junio C Hamano committed about 9 years ago

Merge branch 'rs/strbuf-getwholeline-fix'

Junio C Hamano committed about 9 years ago

Merge branch 'rs/merge-microcleanup'

Junio C Hamano committed about 9 years ago

Merge branch 'rs/fsck-obj-leakfix'

Junio C Hamano committed about 9 years ago

Merge branch 'rs/t4062-obsd'

Junio C Hamano committed about 9 years ago