summaryrefslogtreecommitdiff
path: root/builtin/stash.c
AgeCommit message (Expand)AuthorFilesLines
2019-12-01Merge branch 'tg/stash-refresh-index'Libravatar Junio C Hamano1-4/+3
2019-11-14stash: make sure we have a valid index before writing itLibravatar Thomas Gummerer1-4/+3
2019-11-10Merge branch 'js/update-index-ignore-removal-for-skip-worktree'Libravatar Junio C Hamano1-2/+3
2019-11-02stash: handle staged changes in skip-worktree files correctlyLibravatar Johannes Schindelin1-2/+3
2019-10-18Merge branch 'jj/stash-reset-only-toplevel'Libravatar Junio C Hamano1-1/+1
2019-10-15Merge branch 'en/merge-recursive-cleanup'Libravatar Junio C Hamano1-0/+2
2019-10-15stash: avoid recursive hard reset on submodulesLibravatar Jakob Jarmar1-1/+1
2019-10-11Merge branch 'js/stash-apply-in-secondary-worktree'Libravatar Junio C Hamano1-0/+4
2019-10-06stash apply: report status correctly even in a worktree's subdirectoryLibravatar Johannes Schindelin1-0/+4
2019-09-20stash: make sure to write refreshed cacheLibravatar Thomas Gummerer1-4/+7
2019-08-19Ensure index matches head before invoking merge machinery, round NLibravatar Elijah Newren1-0/+2
2019-07-25Merge branch 'tg/stash-keep-index-with-removed-paths'Libravatar Junio C Hamano1-23/+9
2019-07-16stash: fix handling removed files with --keep-indexLibravatar Thomas Gummerer1-23/+9
2019-06-19stash: fix show referencing stash indexLibravatar Thomas Gummerer1-4/+5
2019-04-25Merge branch 'jk/unused-params-even-more'Libravatar Junio C Hamano1-1/+1
2019-04-22Merge branch 'tg/stash-in-c-show-default-to-p-fix'Libravatar Junio C Hamano1-0/+4
2019-04-22Merge branch 'js/stash-in-c-pathspec-fix'Libravatar Junio C Hamano1-31/+40
2019-04-22Merge branch 'tb/stash-in-c-unused-param-fix'Libravatar Junio C Hamano1-4/+4
2019-04-22Merge branch 'ps/stash-in-c'Libravatar Junio C Hamano1-0/+1635
2019-03-21stash: setup default diff output format if necessaryLibravatar Thomas Gummerer1-0/+4
2019-03-12stash: pass pathspec as pointerLibravatar Thomas Gummerer1-30/+38
2019-03-11stash: drop unused parameterLibravatar Thomas Gummerer1-4/+4
2019-03-08built-in stash: handle :(glob) pathspecs againLibravatar Johannes Schindelin1-2/+3
2019-03-07tests: add a special setup where stash.useBuiltin is offLibravatar Johannes Schindelin1-1/+4
2019-03-07stash: optionally use the scripted version againLibravatar Johannes Schindelin1-0/+35
2019-03-07stash: convert `stash--helper.c` into `stash.c`Libravatar Paul-Sebastian Ungureanu1-0/+1595