summaryrefslogtreecommitdiffstats
path: root/builtin/stash.c (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'en/fill-directory-exponential'Junio C Hamano2020-04-301-12/+5
|\
| * Fix error-prone fill_directory() API; make it only return matchesElijah Newren2020-04-011-12/+5
* | Merge branch 'js/stash-p-fix'Junio C Hamano2020-04-291-1/+1
|\ \
| * | stash -p: (partially) fix bug concerning split hunksJohannes Schindelin2020-04-081-1/+1
* | | Merge branch 'tg/retire-scripted-stash'Junio C Hamano2020-03-271-39/+11
|\ \ \ | |/ / |/| |
| * | stash: remove the stash.useBuiltin settingThomas Gummerer2020-03-051-37/+10
| * | stash: get git_stash_config at the top levelThomas Gummerer2020-03-031-3/+2
* | | Merge branch 'am/pathspec-f-f-more'Junio C Hamano2020-03-091-38/+41
|\ \ \ | |/ / |/| |
| * | stash push: support the --pathspec-from-file optionAlexandr Miloslavskiy2020-02-191-0/+20
| * | stash: eliminate crude option parsingAlexandr Miloslavskiy2020-02-191-38/+21
| |/
* | Merge branch 'js/patch-mode-in-others-in-c'Junio C Hamano2020-02-051-11/+14
|\ \ | |/ |/|
| * built-in stash: use the built-in `git add -p` if so configuredJohannes Schindelin2019-12-221-11/+14
* | Merge branch 'tg/stash-refresh-index'Junio C Hamano2019-12-011-4/+3
|\ \
| * | stash: make sure we have a valid index before writing itThomas Gummerer2019-11-141-4/+3
* | | Merge branch 'js/update-index-ignore-removal-for-skip-worktree'Junio C Hamano2019-11-101-2/+3
|\ \ \ | |_|/ |/| |
| * | stash: handle staged changes in skip-worktree files correctlyJohannes Schindelin2019-11-021-2/+3
* | | Merge branch 'jj/stash-reset-only-toplevel'Junio C Hamano2019-10-181-1/+1
|\ \ \
| * | | stash: avoid recursive hard reset on submodulesJakob Jarmar2019-10-151-1/+1
| |/ /
* | | Merge branch 'en/merge-recursive-cleanup'Junio C Hamano2019-10-151-0/+2
|\ \ \
| * | | Ensure index matches head before invoking merge machinery, round NElijah Newren2019-08-191-0/+2
| |/ /
* | | Merge branch 'js/stash-apply-in-secondary-worktree'Junio C Hamano2019-10-111-0/+4
|\ \ \ | |_|/ |/| |
| * | stash apply: report status correctly even in a worktree's subdirectoryJohannes Schindelin2019-10-061-0/+4
| |/
* / stash: make sure to write refreshed cacheThomas Gummerer2019-09-201-4/+7
|/
* Merge branch 'tg/stash-keep-index-with-removed-paths'Junio C Hamano2019-07-251-23/+9
|\
| * stash: fix handling removed files with --keep-indexThomas Gummerer2019-07-161-23/+9
* | stash: fix show referencing stash indexThomas Gummerer2019-06-191-4/+5
|/
* Merge branch 'jk/unused-params-even-more'Junio C Hamano2019-04-251-1/+1
* Merge branch 'tg/stash-in-c-show-default-to-p-fix'Junio C Hamano2019-04-221-0/+4
|\
| * stash: setup default diff output format if necessaryThomas Gummerer2019-03-211-0/+4
* | Merge branch 'js/stash-in-c-pathspec-fix'Junio C Hamano2019-04-221-31/+40
|\ \
| * | stash: pass pathspec as pointerThomas Gummerer2019-03-121-30/+38
| * | built-in stash: handle :(glob) pathspecs againJohannes Schindelin2019-03-081-2/+3
| |/
* | Merge branch 'tb/stash-in-c-unused-param-fix'Junio C Hamano2019-04-221-4/+4
|\ \
| * | stash: drop unused parameterThomas Gummerer2019-03-111-4/+4
| |/
* / Merge branch 'ps/stash-in-c'Junio C Hamano2019-04-221-2/+4
|/
* tests: add a special setup where stash.useBuiltin is offJohannes Schindelin2019-03-071-1/+4
* stash: optionally use the scripted version againJohannes Schindelin2019-03-071-0/+35
* stash: convert `stash--helper.c` into `stash.c`Paul-Sebastian Ungureanu2019-03-071-0/+1595