summaryrefslogtreecommitdiff
path: root/builtin/reset.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bp/post-index-change-hook'Junio C Hamano2019-04-251-0/+1
|\
| * read-cache: add post-index-change hookBen Peart2019-02-151-0/+1
* | trace2:data: add subverb to reset commandJeff Hostetler2019-02-221-0/+6
|/
* cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy2019-01-241-0/+1
* Merge branch 'nd/the-index'Junio C Hamano2019-01-041-2/+2
|\
| * cache-tree.c: remove the_repository referencesNguyễn Thái Ngọc Duy2018-11-121-1/+1
| * branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy2018-11-121-1/+1
* | reset: warn when refresh_index() takes more than 2 secondsBen Peart2018-10-241-1/+13
* | reset: add new reset.quiet config settingBen Peart2018-10-241-0/+1
* | reset: don't compute unstaged changes after reset when --quietBen Peart2018-10-241-1/+1
|/
* diff.c: reduce implicit dependency on the_indexNguyễn Thái Ngọc Duy2018-09-211-0/+1
* Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano2018-08-021-1/+1
|\
| * block alloc: add lifecycle APIs for cache_entry structsJameson Miller2018-07-031-1/+1
| * read-cache: teach make_cache_entry to take object_idJameson Miller2018-07-031-1/+1
* | commit: add repository argument to lookup_commit_referenceStefan Beller2018-06-291-2/+2
* | Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano2018-06-291-1/+1
|\ \ | |/ |/|
| * path.c: migrate global git_path_* to take a repository argumentStefan Beller2018-05-181-1/+1
* | builtin/reset: convert use of EMPTY_TREE_SHA1_BINbrian m. carlson2018-05-021-1/+1
|/
* Convert find_unique_abbrev* to struct object_idbrian m. carlson2018-03-141-1/+1
* Merge branch 'tg/reset-hard-show-head-with-pretty'Junio C Hamano2018-02-151-18/+10
|\
| * reset --hard: make use of the pretty machinerytg/reset-hard-show-head-with-prettyThomas Gummerer2018-02-021-18/+10
* | Merge branch 'ot/pretty'Junio C Hamano2017-12-271-1/+1
|\ \
| * | format: create pretty.h fileOlga Telezhnaya2017-12-121-1/+1
* | | Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano2017-11-091-1/+1
|\ \ \
| * | | diff: make struct diff_flags members lowercasebw/diff-opt-impl-to-bitfieldsBrandon Williams2017-11-011-1/+1
| * | | diff: remove DIFF_OPT_SET macroBrandon Williams2017-11-011-1/+1
| * | | add, reset: use DIFF_OPT_SET macro to set a diff flagBrandon Williams2017-10-311-1/+1
| |/ /
* | | refs: convert update_ref and refs_update_ref to use struct object_idbrian m. carlson2017-10-161-2/+2
* | | refs: convert delete_ref and refs_delete_ref to struct object_idbrian m. carlson2017-10-161-1/+1
|/ /
* | Merge branch 'jk/leak-checkers'Junio C Hamano2017-09-191-6/+16
|\ \
| * | reset: free allocated tree buffersJeff King2017-09-061-5/+13
| * | reset: make tree counting less confusingJeff King2017-09-061-3/+5
* | | stop leaking lock structs in some simple casesjk/incore-lockfile-removalJeff King2017-09-061-3/+3
|/ /
* | Merge branch 'bw/submodule-config-cleanup'Junio C Hamano2017-08-261-2/+1
|\ \
| * | submodule: remove gitmodules_configBrandon Williams2017-08-031-2/+0
| * | add, reset: ensure submodules can be added or resetBrandon Williams2017-08-021-0/+1
* | | tree-walk: convert fill_tree_descriptor() to object_idrs/object-idRené Scharfe2017-08-141-2/+2
|/ /
* | sha1_name: convert get_sha1* to get_oid*brian m. carlson2017-07-171-5/+5
* | Merge branch 'bw/config-h'Junio C Hamano2017-06-241-0/+1
|\ \
| * | config: don't include config.h by defaultBrandon Williams2017-06-151-0/+1
| |/
* | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-131-27/+12
|\ \
| * | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-011-1/+9
| * | reset/checkout/read-tree: unify config callback for submodule recursionStefan Beller2017-05-301-25/+2
| * | submodule recursing: do not write a config variable twiceStefan Beller2017-05-301-1/+1
* | | Merge branch 'bw/pathspec-sans-the-index'Junio C Hamano2017-05-301-1/+0
|\ \ \
| * | | pathspec: remove PATHSPEC_STRIP_SUBMODULE_SLASH_CHEAPBrandon Williams2017-05-121-1/+0
| | |/ | |/|
* | | Merge branch 'bc/object-id'Junio C Hamano2017-05-291-5/+5
|\ \ \ | |_|/ |/| |
| * | tree: convert parse_tree_indirect to struct object_idbrian m. carlson2017-05-081-2/+2
| * | diff-lib: convert do_diff_cache to struct object_idbrian m. carlson2017-05-081-1/+1
| * | Convert lookup_commit* to struct object_idbrian m. carlson2017-05-081-2/+2
| |/
View Lorry Controller Status