diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2014-07-25 10:08:21 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2014-07-25 10:49:12 -0700 |
| commit | e9f870e25af2fb8bf2dfbf5c92faaff667fd4cc1 (patch) | |
| tree | 9ff028b8fc75082a7b5a605ea04cbef8036a73b2 /doc_src/history.txt | |
| parent | 317660c2fe71dbbb31c85aa313f669f55c2f8df7 (diff) | |
Add support for history --merge to incorporate history changes from
other sessions.
Fixes #825
Diffstat (limited to 'doc_src/history.txt')
| -rw-r--r-- | doc_src/history.txt | 5 |
1 files changed, 4 insertions, 1 deletions
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 <pre> -history (--save | --clear) +history (--save | --clear | --merge) history (--search | --delete ) (--prefix "prefix string" | --contains "search string") </pre> @@ -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. |