Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-26 13:03:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into protocol-extraction

Browse source
This commit is contained in:
Yehuda Katz 2019-12-02 11:16:00 -08:00
commit fe66b4c8ea
2 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Cargo.toml
View file

@ -18,10 +18,10 @@ members = ["crates/nu-errors", "crates/nu-source", "crates/nu-textview", "crates
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies] [dependencies]
nu-source = { path = "./crates/nu-source" } nu-source = { version = "0.1.0", path = "./crates/nu-source" }
nu-protocol = { path = "./crates/nu-protocol" } nu-protocol = { version = "0.1.0", path = "./crates/nu-protocol" }
nu-errors = { path = "./crates/nu-errors" } nu-errors = { version = "0.1.0", path = "./crates/nu-errors" }
nu-parser = { path = "./crates/nu-parser" } nu-parser = { version = "0.1.0", path = "./crates/nu-parser" }
query_interface = "0.3.5" query_interface = "0.3.5"
typetag = "0.1.4" typetag = "0.1.4"

23
docs/commands/config.md
View file

@ -29,13 +29,24 @@ Syntax: `config {flags}`
### Variables ### Variables
| Variable | Type | Description | <<<<<<< HEAD
| Variable | Type | Description |
| ---------- | ---------------- | ------------------------------------------------------- | | ---------- | ---------------- | ------------------------------------------------------- |
| path | table of strings | PATH to use to find binaries | | path | table of strings | PATH to use to find binaries |
| env | row | the environment variables to pass to external commands | | env | row | the environment variables to pass to external commands |
| ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses | | ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses |
| table_mode | "light" or other | enable lightweight or normal tables | | table_mode | "light" or other | enable lightweight or normal tables |
| edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode | | edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode |
=======
| Variable | Type | Description |
| ------------- | ------------- | ----- |
| path | table of strings | PATH to use to find binaries |
| env | row | the environment variables to pass to external commands |
| ctrlc_exit | boolean | whether or not to exit Nu after multiple ctrl-c presses |
| table_mode | "light" or other | enable lightweight or normal tables |
| edit_mode | "vi" or "emacs" | changes line editing to "vi" or "emacs" mode |
> > > > > > > origin/master
## Examples ## Examples