aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'bc/object-id' into baseMichael Haggerty2017-10-28
|\
| * 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
| * 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: 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
* | Merge branch 'jk/ref-filter-colors-fix'Junio C Hamano2017-10-18
|\ \ | |/ |/|
| * tag: respect color.ui configJeff King2017-10-17
| * Revert "color: check color.ui in git_default_config()"Jeff King2017-10-17
| * Merge branch 'jk/ui-color-always-to-auto-maint' (early part) into jk/ref-filt...Junio C Hamano2017-10-17
| |\
* | \ Merge branch 'ds/avoid-overflow-in-midpoint-computation'Junio C Hamano2017-10-11
|\ \ \
| * | | cleanup: fix possible overflow errors in binary searchDerrick Stolee2017-10-10
* | | | Merge branch 'ks/branch-tweak-error-message-for-extra-args'Junio C Hamano2017-10-07
|\ \ \ \
| * | | | branch: change the error messages to be more meaningfulKaartic Sivaraam2017-10-04
| | |/ / | |/| |
* | | | Merge branch 'jk/ui-color-always-to-auto'Junio C Hamano2017-10-07
|\ \ \ \
| * \ \ \ Merge branch 'jk/ui-color-always-to-auto-maint' into jk/ui-color-always-to-autoJunio C Hamano2017-10-04
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | provide --color option for all ref-filter usersJeff King2017-10-04
* | | | | Merge branch 'ma/builtin-unleak'Junio C Hamano2017-10-07
|\ \ \ \ \
| * | | | | builtin/: add UNLEAKsMartin Ågren2017-10-02
| | |_|/ / | |/| | |
* | | | | Merge branch 'sb/branch-avoid-repeated-strbuf-release'Junio C Hamano2017-10-07
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | branch: reset instead of release a strbufStefan Beller2017-10-04
| |/ / /
* | | | Merge branch 'rs/cleanup-strbuf-users'Junio C Hamano2017-10-05
|\ \ \ \
| * | | | use strbuf_addstr() for adding strings to strbufsRené Scharfe2017-10-02
* | | | | Merge branch 'rs/resolve-ref-optional-result'Junio C Hamano2017-10-05
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | refs: pass NULL to resolve_refdup() if hash is not neededRené Scharfe2017-10-01
* | | | | Merge branch 'jk/read-in-full'Junio C Hamano2017-10-03
|\ \ \ \ \
| * | | | | worktree: check the result of read_in_full()Jeff King2017-09-27
| * | | | | worktree: use xsize_t to access file sizeJeff King2017-09-27
| * | | | | distinguish error versus short read from read_in_full()Jeff King2017-09-27
| * | | | | prefer "!=" when checking read_in_full() resultJeff King2017-09-27
* | | | | | Merge branch 'jk/no-optional-locks'Junio C Hamano2017-10-03
|\ \ \ \ \ \
| * | | | | | git: add --no-optional-locks optionJeff King2017-09-27
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'sd/branch-copy'Junio C Hamano2017-10-03
|\ \ \ \ \ \
| * | | | | | branch: fix "copy" to never touch HEADJunio C Hamano2017-09-24
| * | | | | | branch: add a --copy (-c) option to go with --move (-m)Sahil Dua2017-06-18
* | | | | | | Merge branch 'bc/rev-parse-parseopt-fix'Junio C Hamano2017-10-03
|\ \ \ \ \ \ \
| * | | | | | | rev-parse parseopt: interpret any whitespace as start of help textBrandon Casey2017-09-19
| * | | | | | | rev-parse parseopt: do not search help text for flag charsBrandon Casey2017-09-19
| | |/ / / / / | |/| | | | |