summaryrefslogtreecommitdiff
path: root/builtin/stash.c
Commit message (Expand)AuthorAgeFilesLines
...
| * | builtin/stash.c: delete duplicate includeElia Pinto2022-03-131-1/+0
| |/
* | Merge branch 'jc/stash-drop'Junio C Hamano2022-03-161-14/+4
|\ \ | |/ |/|
| * stash: call reflog_delete() in reflog.cJohn Cai2022-03-021-14/+4
* | stash: strip "refs/heads/" with skip_prefixGlen Choo2022-02-241-1/+1
|/
* Merge branch 'js/no-more-legacy-stash'Junio C Hamano2022-02-161-10/+0
|\
| * stash: stop warning about the obsolete `stash.useBuiltin` config settingJohannes Schindelin2022-01-271-10/+0
* | Merge branch 'ab/cat-file'Junio C Hamano2022-02-051-2/+2
|\ \
| * | parse-options API: add a usage_msg_optf()Ævar Arnfjörð Bjarmason2021-12-301-2/+2
* | | Merge branch 'en/keep-cwd'Junio C Hamano2022-01-261-1/+5
|\ \ \ | |_|/ |/| |
| * | sequencer, stash: fix running from worktree subdirElijah Newren2022-01-261-1/+5
* | | Merge branch 'en/stash-df-fix'Junio C Hamano2022-01-101-4/+5
|\ \ \
| * | | stash: do not return before restoring untracked filesElijah Newren2022-01-041-4/+5
* | | | Merge branch 'ja/i18n-similar-messages'Junio C Hamano2022-01-101-4/+4
|\ \ \ \
| * | | | 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-1/+1
| * | | | i18n: turn "options are incompatible" into "cannot be used together"Jean-Noël Avila2022-01-051-2/+2
| | |_|/ | |/| |
* | | | Merge branch 'ab/do-not-limit-stash-help-to-push'Junio C Hamano2022-01-101-0/+1
|\ \ \ \
| * | | | stash: don't show "git stash push" usage on bad "git stash" usageÆvar Arnfjörð Bjarmason2021-12-161-0/+1
* | | | | Merge branch 'en/keep-cwd'Junio C Hamano2022-01-051-1/+3
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| |
| * | | stash: do not attempt to remove startup_info->original_cwdElijah Newren2021-12-091-1/+3
| |/ /
* | | stash: get rid of unused argument in stash_staged()Sergey Organov2021-10-281-3/+3
* | | stash: implement '--staged' option for 'push' and 'save'Sergey Organov2021-10-181-9/+71
|/ /
* | Merge branch 'ab/align-parse-options-help'Junio C Hamano2021-10-131-1/+1
|\ \
| * | parse-options API users: align usage output in C-stringsÆvar Arnfjörð Bjarmason2021-09-121-1/+1
* | | Merge branch 'en/removing-untracked-fixes'Junio C Hamano2021-10-131-1/+4
|\ \ \ | |_|/ |/| |
| * | Comment important codepaths regarding nuking untracked files/dirsElijah Newren2021-09-271-0/+1
| * | Change unpack_trees' 'reset' flag into an enumElijah Newren2021-09-271-2/+2
| * | 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/+3
| |/
* | stash: restore untracked files AFTER restoring tracked filesElijah Newren2021-09-101-3/+3
* | stash: avoid feeding directories to update-indexElijah Newren2021-09-101-0/+14
|/
* Merge branch 'ab/struct-init'Junio C Hamano2021-07-161-2/+1
|\
| * dir.[ch]: replace dir_init() with DIR_INITÆvar Arnfjörð Bjarmason2021-07-011-2/+1
* | Merge branch 'so/log-m-implies-p'Junio C Hamano2021-06-141-1/+1
|\ \
| * | stash list: stop passing "-m" to "git log"Sergey Organov2021-05-211-1/+1
* | | Merge branch 'ah/stash-usage-i18n-fix'Junio C Hamano2021-06-101-2/+2
|\ \ \ | |_|/ |/| |
| * | stash: don't translate literal commandsAlex Henrie2021-05-171-2/+2
| |/
* | 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
View Lorry Controller Status