aboutsummaryrefslogtreecommitdiff
path: root/builtin
Commit message (Expand)AuthorAge
* Merge branch 'bc/object-id'Junio C Hamano2015-12-10
|\
| * Remove get_object_hash.brian m. carlson2015-11-20
| * Convert struct object to object_idbrian m. carlson2015-11-20
| * Add several uses of get_object_hash.brian m. carlson2015-11-20
| * ref_newer: convert to use struct object_idbrian m. carlson2015-11-20
| * add_sought_entry_mem: convert to struct object_idbrian m. carlson2015-11-20
| * Convert struct ref to use object_id.brian m. carlson2015-11-20
* | Merge branch 'dt/refs-backend-pre-vtable'Junio C Hamano2015-12-08
|\ \
| * | initdb: make safe_create_dir publicDavid Turner2015-11-20
* | | Merge branch 'rs/parseopt-short-help'Junio C Hamano2015-12-04
|\ \ \
| * | | show-ref: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe2015-11-20
| * | | grep: stop using PARSE_OPT_NO_INTERNAL_HELPRené Scharfe2015-11-20
| | |/ | |/|
* | | Merge branch 'mk/blame-first-parent'Jeff King2015-12-01
|\ \ \
| * | | blame: fix object casting regressionJeff King2015-11-24
* | | | Merge branch 'maint'Jeff King2015-12-01
|\ \ \ \ | |_|/ / |/| | |
| * | | allow hooks to ignore their standard input streamClemens Buchacher2015-11-16
| * | | Merge branch 'js/misc-fixes' into maintJunio C Hamano2015-11-05
| |\ \ \
| * \ \ \ Merge branch 'jc/add-u-A-default-to-top' into maintJunio C Hamano2015-11-05
| |\ \ \ \
| * \ \ \ \ Merge branch 'nd/clone-linked-checkout' into maintJunio C Hamano2015-11-05
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'es/worktree-add' into maintJunio C Hamano2015-11-04
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'mk/blame-error-message' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'jk/merge-file-exit-code' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'jc/am-3-fallback-regression-fix' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'jc/usage-stdin' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rt/placeholder-in-usage' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'nd/gc-auto-background-fix' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'js/clone-dissociate' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'tk/stripspace' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'jk/repository-extension' into maintJunio C Hamano2015-11-03
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'lf/ref-is-hidden-namespace'Jeff King2015-11-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | hideRefs: add support for matching full refsLukas Fleischer2015-11-05
* | | | | | | | | | | | | | | | | | Merge branch 'dk/gc-idx-wo-pack'Jeff King2015-11-20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | gc: remove garbage .idx files from pack dirDoug Kelly2015-11-04
| * | | | | | | | | | | | | | | | | prepare_packed_git(): refactor garbage reporting in pack directoryJunio C Hamano2015-08-17
* | | | | | | | | | | | | | | | | | Merge branch 'ea/checkout-progress'Junio C Hamano2015-11-05
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | checkout: add --progress optionEdmundo Carmona Antoranz2015-11-01
| | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | Merge branch 'mk/blame-first-parent'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | blame: allow blame --reverse --first-parent when it makes senseMax Kirillov2015-10-30
| * | | | | | | | | | | | | | | | blame: extract find_single_finalMax Kirillov2015-10-30
* | | | | | | | | | | | | | | | | Merge branch 'rs/show-branch-argv-array'Junio C Hamano2015-11-03
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | show-branch: use argv_array for default argumentsRené Scharfe2015-11-01
* | | | | | | | | | | | | | | | | | Merge branch 'jk/merge-file-exit-code'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | merge-file: clamp exit code to maximum 127Jeff King2015-10-29
* | | | | | | | | | | | | | | | | | Merge branch 'rs/pop-commit'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | use pop_commit() for consuming the first entry of a struct commit_listRené Scharfe2015-10-26
* | | | | | | | | | | | | | | | | | | Merge branch 'mk/blame-error-message'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | blame: fix option name in error messageMax Kirillov2015-10-26
* | | | | | | | | | | | | | | | | | | Merge branch 'js/misc-fixes'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Correct fscanf formatting string for I64u valuesWaldek Maleska2015-10-26
| |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | Merge branch 'jc/add-u-A-default-to-top'Junio C Hamano2015-10-30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | |