diff options
| author |  Mark Griffiths <mark@thebespokepixel.com> | 2014-08-01 05:16:02 +0100 |
|---|---|---|
| committer | Mark Griffiths <mark@thebespokepixel.com> | 2014-08-01 05:16:02 +0100 |
| commit | 8ac0fdfea726ff5e4fa8793d5461c6e097e62574 (patch) | |
| tree | a13557f07d83f0037eca4ae295139f2e9c51dda4 /doc_src/history.txt | |
| parent | 6dfd71670ada17b63dd776cb43d37c2fe07c4fee (diff) | |
| parent | 35ba97cbdf52027e3d2f76f24ab4ac034685f098 (diff) | |
Merge branch 'master' into documentation-update
Conflicts:
doc_src/history.txt
doc_src/test.txt
Diffstat (limited to 'doc_src/history.txt')
| -rw-r--r-- | doc_src/history.txt | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/doc_src/history.txt b/doc_src/history.txt index 25c07315..322831ef 100644 --- a/doc_src/history.txt +++ b/doc_src/history.txt @@ -2,7 +2,7 @@ \subsection history-synopsis Synopsis \fish{syn} -history [--save|--clear] +history [--save|--clear|--merge] history [--search|--delete] [--prefix "prefix string"|--contains "search string"] \endfish @@ -11,27 +11,17 @@ 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: - -- `--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. -- `--search` returns history items in keeping with the `--prefix` or -`--contains` options. +- `--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. -- `--contains` searches or deletes items in the history that contain the -specified text string. - -If `--search` is specified without `--contains` or `--prefix`, -`--contains` will be assumed. - -If `--delete` is specified without `--contains` or `--prefix`, -only a history item which exactly matches the parameter will be erased. No -prompt will be given. If `--delete` is specified with either of these -parameters, an interactive prompt will be displayed before any items are -deleted. +- `--prefix` searches or deletes items in the history that begin with the specified text string. +- `--contains` searches or deletes items in the history that contain the specified text string. + +If `--search` is specified without `--contains` or `--prefix`, `--contains` will be assumed. + +If `--delete` is specified without `--contains` or `--prefix`, only a history item which exactly matches the parameter will be erased. No prompt will be given. If `--delete` is specified with either of these parameters, an interactive prompt will be displayed before any items are deleted. \subsection history-examples Example |