diff options
| author |  Mark Griffiths <mark@thebespokepixel.com> | 2014-08-08 03:44:37 +0100 |
|---|---|---|
| committer | Mark Griffiths <mark@thebespokepixel.com> | 2014-08-08 03:44:37 +0100 |
| commit | 629a39b45b9140c4b13ee6965cdf64b229ff40cd (patch) | |
| tree | c71b23ec133c70c35334d7369f906052de934502 /doc_src/history.txt | |
| parent | 6513c7eab8e0536119bf1bc4c2c2f006b09f57c4 (diff) | |
Tutorial auto colouring, Man page and Make fixes
Completely fixes #1557 and the underlying Doxygen changes that caused
it. Should make fish docs simpler and more robust, more consistent and
generally prettier.
todo:
- trap unmarked text as arguments in context
- test & fix sed portability - see in particular. (so far tested on BSD
(Mac) and GNU sed).
- test Makefile changes
- last round of aesthetic changes and getting that ascii fish in there…
Diffstat (limited to 'doc_src/history.txt')
| -rw-r--r-- | doc_src/history.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc_src/history.txt b/doc_src/history.txt index 89d2d6c6..396e4d2e 100644 --- a/doc_src/history.txt +++ b/doc_src/history.txt @@ -2,8 +2,8 @@ \subsection history-synopsis Synopsis \fish{synopsis} -history [--save|--clear|--merge] -history [--search|--delete] [--prefix "prefix string"|--contains "search string"] +history (--merge | --save | --clear) +history (--search | --delete) [--prefix "prefix string" | --contains "search string"] \endfish \subsection history-description Description @@ -11,9 +11,9 @@ history [--search|--delete] [--prefix "prefix string"|--contains "search string" `history` is used to list, search and delete the history of commands used. The following options are available: +- `--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. - `--save` saves all changes in the history file. The shell automatically saves the history file; this option is provided for internal use. - `--clear` clears the history file. A prompt is displayed before the history is erased. -- `--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. - `--search` returns history items in keeping with the `--prefix` or `--contains` options. - `--delete` deletes history items. - `--prefix` searches or deletes items in the history that begin with the specified text string. |