diff --git a/.gitignore b/.gitignore index 37e4c9ba9..3a1d586da 100644 --- a/.gitignore +++ b/.gitignore @@ -6,8 +6,6 @@ bash_autocomplete dist bin croc-stdin* -/transfer_folder -/test .idea/ .vscode/ diff --git a/README.md b/README.md index 13bb0eb6f..8bd9ef65b 100644 --- a/README.md +++ b/README.md @@ -241,7 +241,7 @@ The relay is needed to staple the parallel incoming and outgoing connections. By croc relay ``` -By default it uses TCP ports 9009-9013. Make sure to open those up. You can customized the ports (e.g. `croc relay --ports 1111,1112`), but you must have a minimum of **2** ports for the relay. The first port is for communication and the subsequent ports are used for the multiplexed data transfer. +By default it uses TCP ports 9009-9013. Make sure to open those up. You can customise the ports (e.g. `croc relay --ports 1111,1112`), but you must have a minimum of **2** ports for the relay. The first port is for communication and the subsequent ports are used for the multiplexed data transfer. You can send files using your relay by entering `--relay` to change the relay that you are using if you want to custom host your own. diff --git a/src/cli/cli.go b/src/cli/cli.go index d40f8a3ac..99e2371d4 100644 --- a/src/cli/cli.go +++ b/src/cli/cli.go @@ -266,6 +266,9 @@ func send(c *cli.Context) (err error) { if !c.IsSet("hash") { crocOptions.HashAlgorithm = rememberedOptions.HashAlgorithm } + if !c.IsSet("git") { + crocOptions.GitIgnore = rememberedOptions.GitIgnore + } } var fnames []string