summaryrefslogtreecommitdiff
path: root/builtin/reset.c
AgeCommit message (Expand)Author
2022-01-05i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila
2022-01-05i18n: factorize "--foo requires --bar" and the likeJean-Noël Avila
2022-01-05i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila
2021-12-10Merge branch 'vd/sparse-reset'Junio C Hamano
2021-11-29reset: make --mixed sparse-awareVictoria Dye
2021-11-29reset: integrate with sparse indexVictoria Dye
2021-10-27reset: preserve skip-worktree bit in mixed resetVictoria Dye
2021-10-08reset: rename is_missing to !is_in_reset_treeVictoria Dye
2021-09-27Change unpack_trees' 'reset' flag into an enumElijah Newren
2021-09-27Remove ignored files by default when they are in the wayElijah Newren
2021-09-27unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren
2021-08-25advice: remove read uses of most global `advice_` variablesBen Boeckel
2021-03-14reset: free instead of leaking unneeded refAndrzej Hunt
2020-09-02wt-status: tolerate dangling marksJonathan Tan
2020-04-28Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu
2020-03-16builtin/reset: compute checkout metadata for resetbrian m. carlson
2019-12-10Merge branch 'am/pathspec-from-file'Junio C Hamano
2019-11-25reset: parse rev as tree-ish in patch modeNika Layzell
2019-11-20reset: support the `--pathspec-from-file` optionAlexandr Miloslavskiy
2019-11-20doc: reset: synchronize <pathspec> descriptionAlexandr Miloslavskiy
2019-07-19Merge branch 'nd/tree-walk-with-repo'Junio C Hamano
2019-07-09Merge branch 'nd/switch-and-restore'Junio C Hamano
2019-06-27tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy
2019-04-25Merge branch 'bp/post-index-change-hook'Junio C Hamano
2019-04-02checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy
2019-02-22trace2:data: add subverb to reset commandJeff Hostetler
2019-02-15read-cache: add post-index-change hookBen Peart
2019-01-24cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switchNguyễn Thái Ngọc Duy
2019-01-04Merge branch 'nd/the-index'Junio C Hamano
2018-11-12cache-tree.c: remove the_repository referencesNguyễn Thái Ngọc Duy
2018-11-12branch.c: remove the_repository referenceNguyễn Thái Ngọc Duy
2018-10-24reset: warn when refresh_index() takes more than 2 secondsBen Peart
2018-10-24reset: add new reset.quiet config settingBen Peart
2018-10-24reset: don't compute unstaged changes after reset when --quietBen Peart
2018-09-21diff.c: reduce implicit dependency on the_indexNguyễn Thái Ngọc Duy
2018-08-02Merge branch 'jm/cache-entry-from-mem-pool'Junio C Hamano
2018-07-03block alloc: add lifecycle APIs for cache_entry structsJameson Miller
2018-07-03read-cache: teach make_cache_entry to take object_idJameson Miller
2018-06-29commit: add repository argument to lookup_commit_referenceStefan Beller
2018-06-29Merge branch 'sb/object-store-grafts' into sb/object-store-lookupJunio C Hamano
2018-05-17path.c: migrate global git_path_* to take a repository argumentStefan Beller
2018-05-02builtin/reset: convert use of EMPTY_TREE_SHA1_BINbrian m. carlson
2018-03-14Convert find_unique_abbrev* to struct object_idbrian m. carlson
2018-02-15Merge branch 'tg/reset-hard-show-head-with-pretty'Junio C Hamano
2018-02-02reset --hard: make use of the pretty machineryThomas Gummerer
2017-12-27Merge branch 'ot/pretty'Junio C Hamano
2017-12-12format: create pretty.h fileOlga Telezhnaya
2017-11-09Merge branch 'bw/diff-opt-impl-to-bitfields'Junio C Hamano
2017-11-01diff: make struct diff_flags members lowercaseBrandon Williams
2017-11-01diff: remove DIFF_OPT_SET macroBrandon Williams