summaryrefslogtreecommitdiff
path: root/builtin/reset.c
AgeCommit message (Expand)AuthorFilesLines
2022-01-05i18n: turn even more messages into "cannot be used together" onesLibravatar Jean-Noël Avila1-1/+1
2022-01-05i18n: factorize "--foo requires --bar" and the likeLibravatar Jean-Noël Avila1-2/+2
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Libravatar Jean-Noël Avila1-2/+2
2021-12-10Merge branch 'vd/sparse-reset'Libravatar Junio C Hamano1-6/+107
2021-11-29reset: make --mixed sparse-awareLibravatar Victoria Dye1-2/+85
2021-11-29reset: integrate with sparse indexLibravatar Victoria Dye1-3/+7
2021-10-27reset: preserve skip-worktree bit in mixed resetLibravatar Victoria Dye1-0/+14
2021-10-07reset: rename is_missing to !is_in_reset_treeLibravatar Victoria Dye1-3/+3
2021-09-27Change unpack_trees' 'reset' flag into an enumLibravatar Elijah Newren1-2/+7
2021-09-27Remove ignored files by default when they are in the wayLibravatar Elijah Newren1-2/+1
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsLibravatar Elijah Newren1-0/+2
2021-08-25advice: remove read uses of most global `advice_` variablesLibravatar Ben Boeckel1-1/+1
2021-03-14reset: free instead of leaking unneeded refLibravatar Andrzej Hunt1-1/+1
2020-09-02wt-status: tolerate dangling marksLibravatar Jonathan Tan1-1/+1
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FLibravatar Denton Liu1-2/+2
2020-03-16builtin/reset: compute checkout metadata for resetLibravatar brian m. carlson1-3/+13
2019-12-10Merge branch 'am/pathspec-from-file'Libravatar Junio C Hamano1-4/+21
2019-11-25reset: parse rev as tree-ish in patch modeLibravatar Nika Layzell1-1/+1
2019-11-20reset: support the `--pathspec-from-file` optionLibravatar Alexandr Miloslavskiy1-2/+19
2019-11-20doc: reset: synchronize <pathspec> descriptionLibravatar Alexandr Miloslavskiy1-2/+2
2019-07-19Merge branch 'nd/tree-walk-with-repo'Libravatar Junio C Hamano1-2/+2
2019-07-09Merge branch 'nd/switch-and-restore'Libravatar Junio C Hamano1-1/+1
2019-06-27tree-walk.c: remove the_repo from fill_tree_descriptor()Libravatar Nguyễn Thái Ngọc Duy1-2/+2
2019-04-25Merge branch 'bp/post-index-change-hook'Libravatar Junio C Hamano1-0/+1
2019-04-02checkout: inform the user when removing branch stateLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2019-02-22trace2:data: add subverb to reset commandLibravatar Jeff Hostetler1-0/+6
2019-02-15read-cache: add post-index-change hookLibravatar Ben Peart1-0/+1
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2019-01-04Merge branch 'nd/the-index'Libravatar Junio C Hamano1-2/+2
2018-11-12cache-tree.c: remove the_repository referencesLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-11-12branch.c: remove the_repository referenceLibravatar Nguyễn Thái Ngọc Duy1-1/+1
2018-10-24reset: warn when refresh_index() takes more than 2 secondsLibravatar Ben Peart1-1/+13
2018-10-24reset: add new reset.quiet config settingLibravatar Ben Peart1-0/+1
2018-10-24reset: don't compute unstaged changes after reset when --quietLibravatar Ben Peart1-1/+1
2018-09-21diff.c: reduce implicit dependency on the_indexLibravatar Nguyễn Thái Ngọc Duy1-0/+1
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Libravatar Junio C Hamano1-1/+1
2018-07-03block alloc: add lifecycle APIs for cache_entry structsLibravatar Jameson Miller1-1/+1
2018-07-03read-cache: teach make_cache_entry to take object_idLibravatar Jameson Miller1-1/+1
2018-06-29commit: add repository argument to lookup_commit_referenceLibravatar Stefan Beller1-2/+2
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupLibravatar Junio C Hamano1-1/+1
2018-05-18path.c: migrate global git_path_* to take a repository argumentLibravatar Stefan Beller1-1/+1
2018-05-02builtin/reset: convert use of EMPTY_TREE_SHA1_BINLibravatar brian m. carlson1-1/+1
2018-03-14Convert find_unique_abbrev* to struct object_idLibravatar brian m. carlson1-1/+1
2018-02-15Merge branch 'tg/reset-hard-show-head-with-pretty'Libravatar Junio C Hamano1-18/+10
2018-02-02reset --hard: make use of the pretty machineryLibravatar Thomas Gummerer1-18/+10
2017-12-27Merge branch 'ot/pretty'Libravatar Junio C Hamano1-1/+1
2017-12-12format: create pretty.h fileLibravatar Olga Telezhnaya1-1/+1
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Libravatar Junio C Hamano1-1/+1
2017-11-01diff: make struct diff_flags members lowercaseLibravatar Brandon Williams1-1/+1
2017-11-01diff: remove DIFF_OPT_SET macroLibravatar Brandon Williams1-1/+1