diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-03-26 17:11:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-26 17:11:21 -0700 |
| commit | 369ae7567a4621aa81e5c4decc27715418564ac2 (patch) | |
| tree | d4dd295e54d529f1979b3290533b415326f0dcbd /Makefile | |
| parent | 0f0625a630081d532d528d87ba236a6385bbbac1 (diff) | |
| parent | 8a2cd3f5123ac822fd64ca8efc4f84e122a1edb3 (diff) | |
| download | git-369ae7567a4621aa81e5c4decc27715418564ac2.tar.xz | |
Merge branch 'tg/retire-scripted-stash'
"git stash" has kept an escape hatch to use the scripted version
for a few releases, which got stale. It has been removed.
* tg/retire-scripted-stash:
stash: remove the stash.useBuiltin setting
stash: get git_stash_config at the top level
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -609,7 +609,6 @@ SCRIPT_SH += git-merge-one-file.sh SCRIPT_SH += git-merge-resolve.sh SCRIPT_SH += git-mergetool.sh SCRIPT_SH += git-quiltimport.sh -SCRIPT_SH += git-legacy-stash.sh SCRIPT_SH += git-request-pull.sh SCRIPT_SH += git-submodule.sh SCRIPT_SH += git-web--browse.sh |