From e9f870e25af2fb8bf2dfbf5c92faaff667fd4cc1 Mon Sep 17 00:00:00 2001 From: ridiculousfish Date: Fri, 25 Jul 2014 10:08:21 -0700 Subject: Add support for history --merge to incorporate history changes from other sessions. Fixes #825 --- doc_src/history.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'doc_src/history.txt') diff --git a/doc_src/history.txt b/doc_src/history.txt index 33ee4d66..8545361d 100644 --- a/doc_src/history.txt +++ b/doc_src/history.txt @@ -2,7 +2,7 @@ \subsection history-synopsis Synopsis 
-history (--save | --clear)
+history (--save | --clear | --merge)
 history (--search | --delete ) (--prefix "prefix string" | --contains "search string")
@@ -16,6 +16,9 @@ The following options are available: saves the history file; this option is provided for internal use. - \c --clear clears the history file. A prompt is displayed before the history is erased. +- \c --merge immediately incorporates history changes from other sessions. Ordinarily +fish ignores history changes from sessions started after the current one. This command +applies those changes immediately. - \c --search returns history items in keeping with the \c --prefix or \c --contains options. - \c --delete deletes history items. -- cgit v1.2.3