Merge branch 'mh/test-local-canary'

Junio C Hamano committed almost 9 years ago

Merge branch 'js/submodule-in-excluded'

Junio C Hamano committed almost 9 years ago

Merge branch 'ao/check-resolve-ref-unsafe-result'

Junio C Hamano committed almost 9 years ago

Merge branch 'jk/misc-resolve-ref-unsafe-fixes'

Junio C Hamano committed almost 9 years ago

Merge branch 'sb/diff-color-moved-use-xdl-recmatch'

Junio C Hamano committed almost 9 years ago

Merge branch 'jk/diff-color-moved-fix'

Junio C Hamano committed almost 9 years ago

Merge branch 'kd/auto-col-with-pager-fix'

Junio C Hamano committed almost 9 years ago

Merge branch 'jc/no-cmd-as-subroutine'

Junio C Hamano committed almost 9 years ago

Merge branch 'ma/lockfile-fixes'

Junio C Hamano committed almost 9 years ago

wrapper.c: consistently quote filenames in error messages

Simon Ruderich committed almost 9 years ago

fix typos in 2.15.0 release notes

Jean Carlo Machado committed almost 9 years ago

refs: update some more docs to use "oid" rather than "sha1"

Michael Haggerty committed almost 9 years ago

write_packed_entry(): take `object_id` arguments

Michael Haggerty committed almost 9 years ago

refs: rename constant `REF_ISPRUNING` to `REF_IS_PRUNING`

Michael Haggerty committed almost 9 years ago

refs: rename constant `REF_NODEREF` to `REF_NO_DEREF`

Michael Haggerty committed almost 9 years ago

refs: tidy up and adjust visibility of the `ref_update` flags

Michael Haggerty committed almost 9 years ago

ref_transaction_add_update(): remove a check

Michael Haggerty committed almost 9 years ago

ref_transaction_update(): die on disallowed flags

Michael Haggerty committed almost 9 years ago

prune_ref(): call `ref_transaction_add_update()` directly

Michael Haggerty committed almost 9 years ago

files_transaction_prepare(): don't leak flags to packed transaction

Michael Haggerty committed almost 9 years ago