aboutsummaryrefslogtreecommitdiffhomepage
path: root/share/completions/history.fish
diff options
context:
space:
mode:
authorGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2014-09-17 10:17:48 +0800
committerGravatar David Adam <zanchey@ucc.gu.uwa.edu.au>2014-09-17 10:17:48 +0800
commiteb40baacfc74b7962eeef3d25ccea0046f5ec1ef (patch)
tree220ad9bde88eac1001412b1f38beddca7fe72222 /share/completions/history.fish
parent133ba6e01b5fe1fc87d0278300af9c367653c4b9 (diff)
update completions for builtin commands
Diffstat (limited to 'share/completions/history.fish')
-rw-r--r--share/completions/history.fish2
1 files changed, 2 insertions, 0 deletions
diff --git a/share/completions/history.fish b/share/completions/history.fish
index e2e5c11a..d1255d49 100644
--- a/share/completions/history.fish
+++ b/share/completions/history.fish
@@ -3,3 +3,5 @@ complete -c history -r -l contains --description "Match history items that conta
complete -c history -l search --description "Print matching history items, which is the default behavior"
complete -c history -l delete --description "Interactively delete matching history items"
complete -c history -l clear --description "Clear your entire history"
+complete -c history -l merge --description "Incorporate history changes from other sessions"
+# --save is not completed; it is for internal use