Skip to content

Commit 11346c3

Browse files
authored
chore: change the default timeout and update README.md
1 parent b3afb30 commit 11346c3

3 files changed

Lines changed: 13 additions & 185 deletions

File tree

CHANGELOG.md

Lines changed: 0 additions & 163 deletions
This file was deleted.

README.md

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,41 +58,32 @@ Releases are based on [Conventional Commits](https://www.conventionalcommits.org
5858

5959
## Development Workflow
6060

61-
Start from `develop` your feature branch as in
61+
Start from `main` your feature branch as in
6262

6363
```
64-
git checkout -b feat/something origin/develop
64+
git fetch origin
65+
git switch -c feat/something origin/main
6566
```
6667

6768
Make your changes and any commit to the feature branch as you wish.
6869

69-
When you are ready to promote your changes to develop, from your local branch:
70+
When you are ready to promote your changes to main, from your local branch:
7071

7172
```
72-
git switch develop
73-
git pull origin develop
73+
git switch main
74+
git pull --rebase origin main
7475
git switch feat/something
75-
git rebase -i develop
76+
git rebase -i main
7677
```
7778

78-
Add you fixups and edit the first commit message in a way that it represents your PR intent (`chore:`, `fix:`, `feat:` etc).
79+
Add you fixups and edit the first commit message in a way that it represents your PR intent (`chore:`, `fix:`, `feat:` etc).
7980

80-
Now you push your feature branch and create the PR against `develop`
81+
Now you push your feature branch and create the PR against `main`
8182

8283
```
83-
git push --force-with-lease origin HEAD
84+
git push -u origin feat/something
8485
```
8586

86-
Once your PR is reviewed or you consider it ok to merge anyway:
87-
88-
```
89-
git push origin <COMMIT_HASH>:develop
90-
```
91-
or use GitHub web interface and "SQUASH AND MERGE"
92-
9387
## Release Workflow
9488

95-
To publish a new release open a PR from `develop` to `main` and wait for a review before merge.
96-
97-
98-
89+
To publish your changes open a PR and wait for a review before merge.

http-cli

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FULL_URL=""
1010
HTTP_METHOD="GET"
1111
SET_HTTP_METHOD=0
1212
USER_AGENT="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/370.10 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/370.10"
13-
TIMEOUT=10
13+
TIMEOUT=30
1414
VERBOSE=0
1515
declare -a ENGINE_FLAGS=(--silent --show-error)
1616
declare -a HEADERS=()
@@ -44,7 +44,7 @@ Options:
4444
-D, --dump-header file Dump headers info (file=- or emtpy shows full headers)
4545
-Z, --status-codes Status codes (proxy + server, HTTP only)
4646
-x, --proxy proxy Proxy URL
47-
-t, --timeout timeout Request timeout (default: 10)
47+
-t, --timeout timeout Request timeout (default: 30)
4848
-e, --engine engine HTTP engine (default: curl)
4949
-o, --output file Save response to file
5050
-s, --silent Silent mode (default)

0 commit comments

Comments
 (0)