summaryrefslogtreecommitdiff
path: root/reset.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'pw/use-in-process-checkout-in-rebase'Junio C Hamano2022-02-181-59/+90
|\
| * rebase --apply: set ORIG_HEAD correctlyPhillip Wood2022-01-261-1/+3
| * rebase --apply: fix reflogPhillip Wood2022-01-261-2/+10
| * reset_head(): take struct rebase_head_optsPhillip Wood2022-01-261-20/+18
| * reset_head(): make default_reflog_action optionalPhillip Wood2022-01-261-4/+12
| * reset_head(): factor out ref updatesPhillip Wood2022-01-261-48/+62
| * reset_head(): remove action parameterPhillip Wood2022-01-261-2/+3
| * rebase --apply: don't run post-checkout hook if there is an errorPhillip Wood2022-01-261-1/+1
| * rebase: do not remove untracked files on checkoutPhillip Wood2022-01-261-1/+1
| * rebase: pass correct arguments to post-checkout hookPhillip Wood2022-01-261-9/+9
* | hooks: convert non-worktree 'post-checkout' hook to hook libraryEmily Shaffer2022-01-071-1/+2
|/
* Change unpack_trees' 'reset' flag into an enumElijah Newren2021-09-271-1/+1
* 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
* reset: clear_unpack_trees_porcelain to plug leakAndrzej Hunt2021-07-261-2/+2
* hash: provide per-algorithm null OIDsbrian m. carlson2021-04-271-1/+1
* Merge branch 'dl/merge-autostash'Junio C Hamano2020-04-291-0/+1
* reset: extract reset_head() from rebaseDenton Liu2020-04-101-0/+140