summaryrefslogtreecommitdiff
path: root/builtin/stash.c
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dl/stash-show-untracked-fixup'Junio C Hamano2021-05-221-4/+1
|\
| * stash show: use stash.showIncludeUntracked even when diff options givenDenton Liu2021-05-221-4/+1
* | Merge branch 'dl/stash-show-untracked-fixup'Junio C Hamano2021-05-161-2/+6
|\ \ | |/
| * stash show: fix segfault with --{include,only}-untrackedDenton Liu2021-05-131-2/+6
* | Merge branch 'ds/sparse-index-protections'Junio C Hamano2021-04-301-0/+2
|\ \
| * | stash: ensure full indexDerrick Stolee2021-04-141-0/+2
* | | Merge branch 'mt/parallel-checkout-part-1'Junio C Hamano2021-04-021-0/+2
|\ \ \
| * | | entry: extract a header file for entry.c functionsMatheus Tavares2021-03-231-0/+1
| |/ /
* | | Merge branch 'dl/stash-show-untracked'Junio C Hamano2021-03-221-1/+61
|\ \ \ | |/ / |/| / | |/
| * stash show: learn stash.showIncludeUntrackedDenton Liu2021-03-051-0/+8
| * stash show: teach --include-untracked and --only-untrackedDenton Liu2021-03-051-1/+53
* | Merge branch 'js/params-vs-args'Junio C Hamano2021-02-251-1/+1
|\ \ | |/ |/|
| * replace "parameters" by "arguments" in error messagesJohannes Sixt2021-02-231-1/+1
| * Merge branch 'en/stash-apply-sparse-checkout' into maintJunio C Hamano2021-02-051-49/+116
| |\
* | | stash: declare ref_stash as an arrayDenton Liu2021-02-111-1/+1
* | | Merge branch 'en/stash-apply-sparse-checkout'Junio C Hamano2021-01-151-49/+116
|\ \ \ | |/ / |/| / | |/
| * stash: fix stash application in sparse-checkoutsElijah Newren2020-12-011-2/+48
| * stash: remove unnecessary process forkingElijah Newren2020-12-011-49/+70
* | Merge branch 'km/stash-error-message-fix'Junio C Hamano2020-11-301-1/+1
|\ \ | |/ |/|
| * stash: add missing space to an error messageKyle Meyer2020-11-241-1/+1
* | stash: simplify reflog emptiness checkRené Scharfe2020-11-011-14/+13
* | Merge branch 'jt/interpret-branch-name-fallback'Junio C Hamano2020-09-091-1/+1
|\ \
| * | wt-status: tolerate dangling marksJonathan Tan2020-09-021-1/+1
* | | dir: fix problematic API to avoid memory leaksElijah Newren2020-08-181-2/+2
* | | dir: make clear_directory() free all relevant memoryElijah Newren2020-08-181-3/+0
* | | strvec: rename struct fieldsJeff King2020-07-301-4/+4
* | | strvec: fix indentation in renamed callsJeff King2020-07-281-19/+19
* | | strvec: convert builtin/ callers away from argv_array nameJeff King2020-07-281-57/+57
* | | strvec: rename files from argv-array to strvecJeff King2020-07-281-1/+1
|/ /
* | Merge branch 'en/fill-directory-exponential'Junio C Hamano2020-04-291-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-281-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-261-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-211-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
|\ \ \ \ | |_|/ / |/| | |
View Lorry Controller Status