aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
* ref_transaction_add_update(): remove a checkMichael Haggerty2017-11-06
* ref_transaction_update(): die on disallowed flagsMichael Haggerty2017-11-06
* prune_ref(): call `ref_transaction_add_update()` directlyMichael Haggerty2017-11-06
* files_transaction_prepare(): don't leak flags to packed transactionMichael Haggerty2017-11-06
* Merge branch 'bc/object-id' into baseMichael Haggerty2017-10-28
|\
| * refs/files-backend: convert static functions to object_idbrian m. carlson2017-10-16
| * refs: convert read_raw_ref backends to struct object_idbrian m. carlson2017-10-16
| * refs: convert peel_object to struct object_idbrian m. carlson2017-10-16
| * refs: convert resolve_ref_unsafe to struct object_idbrian m. carlson2017-10-16
| * worktree: convert struct worktree to object_idbrian m. carlson2017-10-16
| * refs: convert resolve_gitlink_ref to struct object_idbrian m. carlson2017-10-16
| * Convert remaining callers of resolve_gitlink_ref to object_idbrian m. carlson2017-10-16
| * sha1_file: convert index_path and index_fd to struct object_idbrian m. carlson2017-10-16
| * refs: convert reflog_expire parameter to struct object_idbrian m. carlson2017-10-16
| * refs: convert read_ref_at to struct object_idbrian m. carlson2017-10-16
| * refs: convert peel_ref to struct object_idbrian m. carlson2017-10-16
| * builtin/pack-objects: convert to struct object_idbrian m. carlson2017-10-16
| * pack-bitmap: convert traverse_bitmap_commit_list to object_idbrian m. carlson2017-10-16
| * refs: convert dwim_log to struct object_idbrian m. carlson2017-10-16
| * builtin/reflog: convert remaining unsigned char uses to object_idbrian m. carlson2017-10-16
| * refs: convert dwim_ref and expand_ref to struct object_idbrian m. carlson2017-10-16
| * refs: convert read_ref and read_ref_full to object_idbrian m. carlson2017-10-16
| * refs: convert resolve_refdup and refs_resolve_refdup to struct object_idbrian m. carlson2017-10-16
| * Convert check_connected to use struct object_idbrian m. carlson2017-10-16
| * refs: update ref transactions to use struct object_idbrian m. carlson2017-10-16
| * refs: prevent accidental NULL dereference in write_pseudorefbrian m. carlson2017-10-16
| * refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-16
| * refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson2017-10-16
| * refs/files-backend: convert struct ref_to_prune to object_idbrian m. carlson2017-10-16
| * walker: convert to struct object_idbrian m. carlson2017-10-16
* | Hopefully final batch before 2.15Junio C Hamano2017-10-28
* | Merge branch 'sg/rev-list-doc-reorder-fix'Junio C Hamano2017-10-28
|\ \
| * | rev-list-options.txt: use correct directional referenceSZEDER Gábor2017-10-27
* | | Merge branch 'sb/rev-parse-show-superproject-root'Junio C Hamano2017-10-28
|\ \ \
| * | | docs: fix formatting of rev-parse's --show-superproject-working-treeSebastian Schuberth2017-10-27
* | | | Merge branch 'ao/path-use-xmalloc'Junio C Hamano2017-10-28
|\ \ \ \
| * | | | path.c: use xmalloc() in add_to_trie()Andrey Okoshkin2017-10-25
* | | | | Merge branch 'np/config-path-doc'Junio C Hamano2017-10-28
|\ \ \ \ \
| * | | | | config doc: clarify "git config --path" exampleNathan Payre2017-10-19
* | | | | | Merge branch 'mh/ref-locking-fix'Junio C Hamano2017-10-26
|\ \ \ \ \ \
| * | | | | | files_transaction_prepare(): fix handling of ref lock failureMichael Haggerty2017-10-25
| * | | | | | t1404: add a bunch of tests of D/F conflictsMichael Haggerty2017-10-25
* | | | | | | Merge tag 'l10n-2.15.0-rnd2' of git://github.com/git-l10n/git-poJunio C Hamano2017-10-24
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jx/zh_CN-proposed' of github.com:jiangxin/gitJiang Xin2017-10-24
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: zh_CN: review for git v2.15.0 l10n round 2Ray Chen2017-10-24
| | * | | | | | | l10n: zh_CN: for git v2.15.0 l10n round 2Jiang Xin2017-10-24
| |/ / / / / / /
| * | | | | | | Merge branch 'master' of https://github.com/ralfth/git-po-deJiang Xin2017-10-24
| |\ \ \ \ \ \ \
| | * | | | | | | l10n: de.po: fix typosAndre Hinrichs2017-10-23
| | * | | | | | | l10n: de.po: translate 70 new messagesRalf Thielow2017-10-23
| |/ / / / / / /
| * | | | | | | l10n: ru.po: update Russian translationDimitriy Ryazantcev2017-10-22