summaryrefslogtreecommitdiff
path: root/builtin/reset.c
Commit message (Expand)AuthorAgeFilesLines
* cocci: apply the "cache.h" part of "the_repository.pending"Ævar Arnfjörð Bjarmason2023-03-281-9/+10
* Merge branch 'ab/various-leak-fixes'Junio C Hamano2023-02-221-3/+8
|\
| * various: add missing clear_pathspec(), fix leaksÆvar Arnfjörð Bjarmason2023-02-061-3/+8
* | add API: remove run_add_interactive() wrapper functionÆvar Arnfjörð Bjarmason2023-02-061-1/+3
|/
* Merge branch 'jk/unused-post-2.39'Junio C Hamano2022-12-261-1/+2
|\
| * diff: mark unused parameters in callbacksJeff King2022-12-131-1/+2
* | Merge branch 'ab/various-leak-fixes'Junio C Hamano2022-12-141-0/+2
|\ \ | |/ |/|
| * {reset,merge}: call discard_index() before returningÆvar Arnfjörð Bjarmason2022-11-211-0/+2
* | cocci: apply "pending" index-compatibility to some "builtin/*.c"Ævar Arnfjörð Bjarmason2022-11-211-4/+5
* | cocci & cache.h: apply variable section of "pending" index-compatibilityÆvar Arnfjörð Bjarmason2022-11-211-1/+1
* | cocci & cache.h: apply a selection of "pending" index-compatibilityÆvar Arnfjörð Bjarmason2022-11-211-2/+3
* | cocci & cache.h: remove rarely used "the_index" compat macrosÆvar Arnfjörð Bjarmason2022-11-211-2/+2
* | reset: use 'skip_cache_tree_update' optionVictoria Dye2022-11-101-0/+2
|/
* pathspec.h: move pathspec_needs_expanded_index() from reset.c to hereShaoxuan Yuan2022-08-081-83/+1
* reset: show --no-refresh in the short-helpJunio C Hamano2022-03-241-3/+3
* reset: remove 'reset.refresh' config optionVictoria Dye2022-03-231-3/+1
* reset: remove 'reset.quiet' config optionVictoria Dye2022-03-231-1/+0
* reset: do not make '--quiet' disable index refreshVictoria Dye2022-03-231-8/+1
* reset: suppress '--no-refresh' advice if logging is silencedVictoria Dye2022-03-141-1/+1
* reset: replace '--quiet' with '--no-refresh' in performance adviceVictoria Dye2022-03-141-4/+4
* reset: introduce --[no-]refresh option to --mixedVictoria Dye2022-03-141-1/+12
* reset: revise index refresh adviceVictoria Dye2022-03-141-2/+2
* Merge branch 'ab/diff-free-more'Junio C Hamano2022-02-251-1/+0
|\
| * diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec)Ævar Arnfjörð Bjarmason2022-02-161-1/+0
* | Merge branch 'vd/sparse-clean-etc'Junio C Hamano2022-02-171-3/+9
|\ \ | |/ |/|
| * reset: reorder wildcard pathspec conditionsVictoria Dye2022-01-131-3/+9
* | i18n: turn even more messages into "cannot be used together" onesJean-Noël Avila2022-01-051-1/+1
* | i18n: factorize "--foo requires --bar" and the likeJean-Noël Avila2022-01-051-2/+2
* | i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-051-2/+2
|/
* Merge branch 'vd/sparse-reset'Junio C Hamano2021-12-101-6/+107
|\
| * reset: make --mixed sparse-awareVictoria Dye2021-11-291-2/+85
| * reset: integrate with sparse indexVictoria Dye2021-11-291-3/+7
| * reset: preserve skip-worktree bit in mixed resetVictoria Dye2021-10-271-0/+14
| * reset: rename is_missing to !is_in_reset_treeVictoria Dye2021-10-071-3/+3
* | Change unpack_trees' 'reset' flag into an enumElijah Newren2021-09-271-2/+7
* | Remove ignored files by default when they are in the wayElijah Newren2021-09-271-2/+1
* | unpack-trees: introduce preserve_ignored to unpack_trees_optionsElijah Newren2021-09-271-0/+2
|/
* advice: remove read uses of most global `advice_` variablesBen Boeckel2021-08-251-1/+1
* reset: free instead of leaking unneeded refAndrzej Hunt2021-03-141-1/+1
* wt-status: tolerate dangling marksJonathan Tan2020-09-021-1/+1
* Use OPT_CALLBACK and OPT_CALLBACK_FDenton Liu2020-04-281-2/+2
* builtin/reset: compute checkout metadata for resetbrian m. carlson2020-03-161-3/+13
* Merge branch 'am/pathspec-from-file'Junio C Hamano2019-12-101-4/+21
|\
| * reset: support the `--pathspec-from-file` optionAlexandr Miloslavskiy2019-11-201-2/+19
| * doc: reset: synchronize <pathspec> descriptionAlexandr Miloslavskiy2019-11-201-2/+2
* | reset: parse rev as tree-ish in patch modeNika Layzell2019-11-251-1/+1
|/
* Merge branch 'nd/tree-walk-with-repo'Junio C Hamano2019-07-191-2/+2
|\
| * tree-walk.c: remove the_repo from fill_tree_descriptor()Nguyễn Thái Ngọc Duy2019-06-271-2/+2
* | Merge branch 'nd/switch-and-restore'Junio C Hamano2019-07-091-1/+1
|\ \ | |/ |/|
| * checkout: inform the user when removing branch stateNguyễn Thái Ngọc Duy2019-04-021-1/+1