diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2016-02-16 11:34:36 -0800 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2016-02-16 11:34:36 -0800 |
| commit | c184c1a81a16a3f043c56837465d9972e6f8d73e (patch) | |
| tree | 557130da42b010202a432326cd41e6e0cf767ebc /share/functions/history.fish | |
| parent | 31a617408fb42b0d595088ac10458a3a4922543d (diff) | |
Correctly handle --merge in the history.fish function
Previously --merge happened to work, but only because it was
smuggled in through the 'print' command
Diffstat (limited to 'share/functions/history.fish')
| -rw-r--r-- | share/functions/history.fish | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/share/functions/history.fish b/share/functions/history.fish index d513c191..b6d8ee96 100644 --- a/share/functions/history.fish +++ b/share/functions/history.fish @@ -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)" |