mirror of
https://github.com/fish-shell/fish-shell.git
synced 2024-11-23 20:33:44 +08:00
Correctly handle --merge in the history.fish function
Previously --merge happened to work, but only because it was smuggled in through the 'print' command
This commit is contained in:
parent
31a617408f
commit
c184c1a81a
|
@ -35,6 +35,7 @@ function history --description "Deletes an item from history"
|
|||
case --search
|
||||
set cmd print
|
||||
case --merge
|
||||
set cmd merge
|
||||
case --
|
||||
set -e argv[$i]
|
||||
break
|
||||
|
@ -128,6 +129,8 @@ function history --description "Deletes an item from history"
|
|||
case save
|
||||
#Save changes to history file
|
||||
builtin history $argv
|
||||
case merge
|
||||
builtin history --merge
|
||||
case clear
|
||||
# Erase the entire history
|
||||
echo "Are you sure you want to clear history ? (y/n)"
|
||||
|
|
Loading…
Reference in New Issue
Block a user